Changeset 6165

Timestamp:

12/13/2016 09:11:10 AM (6 years ago)

Author:

xknown

Message:

Branch 1.2: Fix PHP 7 compat issue.

• func_get_arg() returns the current (modified) value of the given argument.
• Add also PHP 5.x style constructors.

See #3033

File:

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

branches/1.2/bb-admin/includes/functions.bb-admin.php

@@ -739 +739 @@
     var $paging_text_bottom;
 
-    function BB_User_Search ($search_term = false, $page = 1, $roles = false ) { // constructor
+    function __construct($search_term = false, $page = 1, $roles = false ) { // constructor
         $this->search_term = $search_term ? stripslashes($search_term) : false;
         $this->raw_page = ( '' == $page ) ? false : (int) $page;
@@ -757 +757 @@
         $this->prepare_vars_for_template_usage();
         $this->do_paging();
+    }
+
+    function BB_User_Search( $search_term = false, $page = 1, $roles = false ) {
+        $this->__construct( $search_term, $page, $roles );
     }
 
@@ -949 +953 @@
     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;
@@ -957 +961 @@
         $this->query();
         $this->do_paging();
+    }
+
+    function BB_Users_By_Role($role = '', $page = '') {
+        $this->__construct($role, $page);
     }
 
@@ -979 +987 @@
         return false;
 
+    $func_args = func_get_args();
     $defaults = array( 'forum_name' => '', 'forum_desc' => '', 'forum_parent' => 0, 'forum_order' => false, 'forum_is_category' => 0 );
     $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']  = $func_args[0];
+        $args['forum_desc']  = $func_args[1];
+        $args['forum_order'] = 2 < func_num_args() ? $func_args[2] : 0;
     endif;
 
@@ -1026 +1035 @@
         return false;
 
+    $func_args = func_get_args();
     $defaults = array( 'forum_id' => 0, 'forum_name' => '', 'forum_slug' => '', 'forum_desc' => '', 'forum_parent' => 0, 'forum_order' => 0, 'forum_is_category' => 0 );
     $fields = array( 'forum_name', 'forum_desc', 'forum_parent', 'forum_order' );
     $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']    = $func_args[0];
+        $args['forum_name']  = $func_args[1];
+        $args['forum_desc']  = 2 < func_num_args() ? $func_args[2] : '';
+        $args['forum_order'] = 3 < func_num_args() && is_numeric($func_args[3]) ? $func_args[3] : 0;
     endif;