Changeset 6167

Timestamp:

12/13/2016 09:16:20 AM (8 years ago)

Author:

xknown

Message:

Branch 1.2: Fix PHP 7 compat issues w.r.t. the use of func_get_arg().

func_get_arg() returns the current (modified) value of the given argument. Let's make sure the code behaves the same.

See #3033

Location:

branches/1.2/bb-includes

Files:

• functions.bb-forums.php (modified) (1 diff)
• functions.bb-template.php (modified) (4 diffs)
• functions.bb-topic-tags.php (modified) (4 diffs)
• functions.bb-topics.php (modified) (3 diffs)

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

@@ -62 +62 @@
         $args = array( 'child_of' => $args, 'hierarchical' => 1, 'depth' => 0 );
     } elseif ( is_callable($args) ) {
+        $_args = func_get_args();
         $args = array( 'callback' => $args );
         if ( 1 < func_num_args() )
-            $args['callback_args'] = func_get_arg(1);
+            $args['callback_args'] = $_args[1];
     }
 

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

@@ -916 +916 @@
     global $bb_forums_loop;
 
+    $_args = func_get_args();
     $default_type = 'flat';
 
@@ -922 +923 @@
     } elseif ( func_num_args() > 1 ) { // bb_forums( 'ul', $args ); Deprecated
         $default_type = $args;
-        $args = func_get_arg(1);
+        $args = $_args[1];
     } elseif ( $args && is_string($args) && false === strpos($args, '=') ) {
         $args = array( 'type' => $args );
@@ -3225 +3226 @@
 
 function bb_tag_heat_map( $args = '' ) {
+    $_args = func_get_args();
     $defaults = array( 'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'limit' => 40, 'format' => 'flat' );
     $args = wp_parse_args( $args, $defaults );
 
     if ( 1 < $fn = func_num_args() ) : // For back compat
-        $args['smallest'] = func_get_arg(0);
-        $args['largest']  = func_get_arg(1);
-        $args['unit']     = 2 < $fn ? func_get_arg(2) : $unit;
-        $args['limit']    = 3 < $fn ? func_get_arg(3) : $limit;
+        $args['smallest'] = $_args[0];
+        $args['largest']  = $_args[1];
+        $args['unit']     = 2 < $fn ? $_args[2] : $unit;
+        $args['limit']    = 3 < $fn ? $_args[3] : $limit;
     endif;
 
@@ -3312 +3314 @@
 
 function bb_forum_dropdown( $args = '' ) {
+    $_args = func_get_args();
     if ( $args && is_string($args) && false === strpos($args, '=') )
         $args = array( 'callback' => $args );
     if ( 1 < func_num_args() )
-        $args['callback_args'] = func_get_arg(1);
+        $args['callback_args'] = $_args[1];
     echo bb_get_forum_dropdown( $args );
 }
 
 function bb_get_forum_dropdown( $args = '' ) {
+    $_args = func_get_args();
     $defaults = array( 'callback' => false, 'callback_args' => false, 'id' => 'forum_id', 'none' => false, 'selected' => false, 'tab' => false, 'hierarchical' => 1, 'depth' => 0, 'child_of' => 0, 'disable_categories' => 1, 'options_only' => false );
     if ( $args && is_string($args) && false === strpos($args, '=') )
         $args = array( 'callback' => $args );
     if ( 1 < func_num_args() )
-        $args['callback_args'] = func_get_arg(1);
+        $args['callback_args'] = $_args[1];
 
     $args = wp_parse_args( $args, $defaults );

branches/1.2/bb-includes/functions.bb-topic-tags.php

@@ -355 +355 @@
 function get_tagged_topics( $args ) {
     global $tagged_topic_count;
+    $_args = func_get_args();
     $defaults = array( 'tag_id' => false, 'page' => 1, 'number' => false, 'count' => true );
     if ( is_numeric( $args ) )
@@ -361 +362 @@
         $args = wp_parse_args( $args ); // Make sure it's an array
     if ( 1 < func_num_args() )
-        $args['page'] = func_get_arg(1);
+        $args['page'] = $_args[1];
     if ( 2 < func_num_args() )
-        $args['number'] = func_get_arg(2);
+        $args['number'] = $_args[2];
 
     $args = wp_parse_args( $args, $defaults );
@@ -377 +378 @@
 
 function get_tagged_topic_posts( $args ) {
+    $_args = func_get_args();
     $defaults = array( 'tag_id' => false, 'page' => 1, 'number' => false );
     if ( is_numeric( $args ) )
@@ -383 +385 @@
         $args = wp_parse_args( $args ); // Make sure it's an array
     if ( 1 < func_num_args() )
-        $args['page'] = func_get_arg(1);
+        $args['page'] = $_args[1];
     if ( 2 < func_num_args() )
-        $args['number'] = func_get_arg(2);
+        $args['number'] = $_args[2];
 
     $args = wp_parse_args( $args, $defaults );

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

@@ -60 +60 @@
 
 function get_latest_topics( $args = null ) {
+    $_args = func_get_args();
     $defaults = array( 'forum' => false, 'page' => 1, 'exclude' => false, 'number' => false );
     if ( is_numeric( $args ) )
@@ -66 +67 @@
         $args = wp_parse_args( $args ); // Make sure it's an array
     if ( 1 < func_num_args() )
-        $args['page'] = func_get_arg(1);
+        $args['page'] = $_args[1];
     if ( 2 < func_num_args() )
-        $args['exclude'] = func_get_arg(2);
+        $args['exclude'] = $_args[2];
 
     $args = wp_parse_args( $args, $defaults );
@@ -437 +438 @@
 
 function get_thread( $topic_id, $args = null ) {
+    $_args = func_get_args();
     $defaults = array( 'page' => 1, 'order' => 'ASC' );
     if ( is_numeric( $args ) )
         $args = array( 'page' => $args );
-    if ( @func_get_arg(2) )
+    if ( @$_args[2] )
         $defaults['order'] = 'DESC';