Changeset 6160 for branches/0.9/bb-admin/admin-functions.php

Timestamp:

12/12/2016 01:59:44 PM (8 years ago)

Author:

xknown

Message:

Branch 0.9: Fix PHP 7 compat issues w.r.t. the use of func_get_arg() and PHP 5.x constructors.

• func_get_arg() returns the current (modified) value of the given argument. Let's make sure the code behaves the same.
• Add PHP 5.x style constructors.
• Use preg_match instead of eregi

See #3033

File:

• branches/0.9/bb-admin/admin-functions.php (modified) (6 diffs)

branches/0.9/bb-admin/admin-functions.php

@@ -248 +248 @@
     var $search_errors;
 
-    function BB_User_Search ($search_term = false, $page = 1 ) { // constructor
+    function __construct ($search_term = false, $page = 1 ) { // constructor
         $this->search_term = $search_term ? stripslashes($search_term) : false;
         $this->raw_page = ( '' == $page ) ? false : (int) $page;
@@ -258 +258 @@
         $this->prepare_vars_for_template_usage();
         $this->do_paging();
+    }
+
+    function BB_User_Search ($search_term = false, $page = 1 ) {
+        $this->__construct( $search_term, $page );
     }
 
@@ -403 +407 @@
     var $title = '';
 
-    function BB_Users_By_Role($role = '', $page = '') { // constructor
+    function __construct($role = '', $page = '') { // constructor
         $this->role = $role ? $role : 'member';
         $this->raw_page = ( '' == $page ) ? false : (int) $page;
@@ -411 +415 @@
         $this->query();
         $this->do_paging();
+    }
+
+    function BB_Users_By_Role($role = '', $page = '') {
+        $this->__construct($role, $page);
     }
 
@@ -435 +443 @@
         return false;
 
+    $_args = func_get_args();
     $defaults = array( 'forum_name' => '', 'forum_desc' => '', 'forum_parent' => 0, 'forum_order' => false );
     $args = wp_parse_args( $args, $defaults );
     if ( 1 < func_num_args() ) : // For back compat
-        $args['forum_name']  = func_get_arg(0);
-        $args['forum_desc']  = func_get_arg(1);
-        $args['forum_order'] = 2 < func_num_args() ? func_get_arg(2) : 0;
+        $args['forum_name']  = $_args[0];
+        $args['forum_desc']  = $_args[1];
+        $args['forum_order'] = 2 < func_num_args() ? $_args[2] : 0;
     endif;
 
@@ -480 +489 @@
         return false;
 
+    $_args = func_get_args();
     $defaults = array( 'forum_id' => 0, 'forum_name' => '', 'forum_desc' => '', 'forum_parent' => 0, 'forum_order' => 0 );
     $args = wp_parse_args( $args, $defaults );
     if ( 1 < func_num_args() ) : // For back compat
-        $args['forum_id']    = func_get_arg(0);
-        $args['forum_name']  = func_get_arg(1);
-        $args['forum_desc']  = 2 < func_num_args() ? func_get_arg(2) : '';
-        $args['forum_order'] = 3 < func_num_args() && is_numeric(func_get_arg(3)) ? func_get_arg(3) : 0;
+        $args['forum_id']    = $_args[0];
+        $args['forum_name']  = $_args[1];
+        $args['forum_desc']  = 2 < func_num_args() ? $_args[2] : '';
+        $args['forum_order'] = 3 < func_num_args() && is_numeric($_args[3]) ? $_args[3] : 0;
     endif;