Changeset 46149 for trunk/src/wp-includes/plugin.php

Timestamp:

09/16/2019 02:47:53 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Remove redundant PHP 4 code from do_action().

As of PHP 5, objects are always passed by reference, so this has not been needed for quite some time.

Props jrf.
See #47678.

File:

• trunk/src/wp-includes/plugin.php (modified) (2 diffs)

trunk/src/wp-includes/plugin.php

@@ -449 +449 @@
         }
 
+        $all_args = func_get_args();
+
         // Do 'all' actions first
         if ( isset( $wp_filter['all'] ) ) {
                 $wp_current_filter[] = $tag;
-                $all_args            = func_get_args();
                 _wp_call_all_hook( $all_args );
         }
@@ -467 +468 @@
         }
 
-        $args = array();
-        if ( is_array( $arg ) && 1 == count( $arg ) && isset( $arg[0] ) && is_object( $arg[0] ) ) { // array(&$this)
-                $args[] =& $arg[0];
-        } else {
-                $args[] = $arg;
-        }
-        for ( $a = 2, $num = func_num_args(); $a < $num; $a++ ) {
-                $args[] = func_get_arg( $a );
+        $args = $all_args;
+        array_shift( $args );
+
+        if ( empty( $args ) ) {
+                $args = array( '' );
         }