Changeset 22118

Timestamp:

10/04/2012 08:00:16 PM (12 years ago)

Author:

ryan

Message:

Objects no longer need to be explicitly passed by ref to call_user_func*() to be callable. Props wonderboymusic. fixes #21865

Location:

trunk/wp-includes

Files:

• cache.php (modified) (1 diff)
• capabilities.php (modified) (3 diffs)
• class-http.php (modified) (1 diff)
• class-oembed.php (modified) (1 diff)
• class-wp-walker.php (modified) (3 diffs)
• class-wp.php (modified) (1 diff)
• default-widgets.php (modified) (2 diffs)
• nav-menu-template.php (modified) (1 diff)
• post-template.php (modified) (2 diffs)
• taxonomy.php (modified) (1 diff)
• widgets.php (modified) (2 diffs)
• wp-db.php (modified) (2 diffs)
• wp-diff.php (modified) (1 diff)

trunk/wp-includes/cache.php

@@ -636 +636 @@
          * already calls __destruct()
          */
-        register_shutdown_function( array( &$this, '__destruct' ) );
+        register_shutdown_function( array( $this, '__destruct' ) );
     }
 

trunk/wp-includes/capabilities.php

@@ -726 +726 @@
         //Filter out caps that are not role names and assign to $this->roles
         if ( is_array( $this->caps ) )
-            $this->roles = array_filter( array_keys( $this->caps ), array( &$wp_roles, 'is_role' ) );
+            $this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
 
         //Build $allcaps from role caps, overlay user's $caps
@@ -1332 +1332 @@
     $args = array_merge( array( $capability ), $args );
 
-    return call_user_func_array( array( &$author, 'has_cap' ), $args );
+    return call_user_func_array( array( $author, 'has_cap' ), $args );
 }
 
@@ -1354 +1354 @@
     $args = array_merge( array( $capability ), $args );
 
-    return call_user_func_array( array( &$user, 'has_cap' ), $args );
+    return call_user_func_array( array( $user, 'has_cap' ), $args );
 }
 

trunk/wp-includes/class-http.php

@@ -1110 +1110 @@
 
         if ( true === $r['blocking'] )
-            curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( &$this, 'stream_headers' ) );
+            curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) );
 
         curl_setopt( $handle, CURLOPT_HEADER, false );

trunk/wp-includes/class-oembed.php

@@ -54 +54 @@
 
         // Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
-        add_filter( 'oembed_dataparse', array(&$this, '_strip_newlines'), 10, 3 );
+        add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 );
     }
 

trunk/wp-includes/class-wp-walker.php

@@ -127 +127 @@
             $args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
         $cb_args = array_merge( array(&$output, $element, $depth), $args);
-        call_user_func_array(array(&$this, 'start_el'), $cb_args);
+        call_user_func_array(array($this, 'start_el'), $cb_args);
 
         $id = $element->$id_field;
@@ -140 +140 @@
                     //start the child delimiter
                     $cb_args = array_merge( array(&$output, $depth), $args);
-                    call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
+                    call_user_func_array(array($this, 'start_lvl'), $cb_args);
                 }
                 $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
@@ -150 +150 @@
             //end the child delimiter
             $cb_args = array_merge( array(&$output, $depth), $args);
-            call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
+            call_user_func_array(array($this, 'end_lvl'), $cb_args);
         }
 
         //end this element
         $cb_args = array_merge( array(&$output, $element, $depth), $args);
-        call_user_func_array(array(&$this, 'end_el'), $cb_args);
+        call_user_func_array(array($this, 'end_el'), $cb_args);
     }
 

trunk/wp-includes/class-wp.php

@@ -607 +607 @@
      */
     function _map() {
-        $callback = array(&$this, 'callback');
+        $callback = array($this, 'callback');
         return preg_replace_callback($this->_pattern, $callback, $this->_subject);
     }

trunk/wp-includes/default-widgets.php

@@ -537 +537 @@
         $this->alt_option_name = 'widget_recent_entries';
 
-        add_action( 'save_post', array(&$this, 'flush_widget_cache') );
-        add_action( 'deleted_post', array(&$this, 'flush_widget_cache') );
-        add_action( 'switch_theme', array(&$this, 'flush_widget_cache') );
+        add_action( 'save_post', array($this, 'flush_widget_cache') );
+        add_action( 'deleted_post', array($this, 'flush_widget_cache') );
+        add_action( 'switch_theme', array($this, 'flush_widget_cache') );
     }
 
@@ -638 +638 @@
 
         if ( is_active_widget(false, false, $this->id_base) )
-            add_action( 'wp_head', array(&$this, 'recent_comments_style') );
-
-        add_action( 'comment_post', array(&$this, 'flush_widget_cache') );
-        add_action( 'transition_comment_status', array(&$this, 'flush_widget_cache') );
+            add_action( 'wp_head', array($this, 'recent_comments_style') );
+
+        add_action( 'comment_post', array($this, 'flush_widget_cache') );
+        add_action( 'transition_comment_status', array($this, 'flush_widget_cache') );
     }
 

trunk/wp-includes/nav-menu-template.php

@@ -476 +476 @@
     $args = array( $items, $depth, $r );
 
-    return call_user_func_array( array(&$walker, 'walk'), $args );
+    return call_user_func_array( array($walker, 'walk'), $args );
 }
 

trunk/wp-includes/post-template.php

@@ -938 +938 @@
 
     $args = array($pages, $depth, $r, $current_page);
-    return call_user_func_array(array(&$walker, 'walk'), $args);
+    return call_user_func_array(array($walker, 'walk'), $args);
 }
 
@@ -955 +955 @@
         $walker = $args[2]['walker'];
 
-    return call_user_func_array(array(&$walker, 'walk'), $args);
+    return call_user_func_array(array($walker, 'walk'), $args);
 }
 

trunk/wp-includes/taxonomy.php

@@ -1411 +1411 @@
         $children = _get_term_hierarchy($taxonomies[0]);
         if ( ! empty($children) )
-            $terms = & _get_term_children($child_of, $terms, $taxonomies[0]);
+            $terms = _get_term_children($child_of, $terms, $taxonomies[0]);
     }
 

trunk/wp-includes/widgets.php

@@ -153 +153 @@
 
     function _get_display_callback() {
-        return array(&$this, 'display_callback');
+        return array($this, 'display_callback');
     }
 
     function _get_update_callback() {
-        return array(&$this, 'update_callback');
+        return array($this, 'update_callback');
     }
 
     function _get_form_callback() {
-        return array(&$this, 'form_callback');
+        return array($this, 'form_callback');
     }
 
@@ -318 +318 @@
 
     function WP_Widget_Factory() {
-        add_action( 'widgets_init', array( &$this, '_register_widgets' ), 100 );
+        add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
     }
 

trunk/wp-includes/wp-db.php

@@ -535 +535 @@
      */
     function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
-        register_shutdown_function( array( &$this, '__destruct' ) );
+        register_shutdown_function( array( $this, '__destruct' ) );
 
         if ( WP_DEBUG )
@@ -1001 +1001 @@
         $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware
         $query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
-        array_walk( $args, array( &$this, 'escape_by_ref' ) );
+        array_walk( $args, array( $this, 'escape_by_ref' ) );
         return @vsprintf( $query, $args );
     }

trunk/wp-includes/wp-diff.php

@@ -423 +423 @@
 
         // L1-norm of difference vector.
-        $difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) );
+        $difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
 
         // $string1 has zero length? Odd. Give huge penalty by not dividing.