Changeset 46322

Timestamp:

09/26/2019 01:52:46 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernisation: Introduce the spread operator in do_action().

Rather than relying on func_get_args() to retrieve arbitrary function arguments, we can now use the spread operator to assign them directly to a variable.

Props jrf.
See #47678.

File:

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

trunk/src/wp-includes/plugin.php

@@ -440 +440 @@
  *                       functions hooked to the action. Default empty.
  */
-function do_action( $tag, $arg = '' ) {
+function do_action( $tag, ...$arg ) {
     global $wp_filter, $wp_actions, $wp_current_filter;
 
@@ -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 );
     }
@@ -468 +467 @@
     }
 
-    $args = $all_args;
-    array_shift( $args );
-
-    if ( empty( $args ) ) {
-        $args = array( '' );
-    }
-
-    $wp_filter[ $tag ]->do_action( $args );
+    if ( empty( $arg ) ) {
+        $arg[] = '';
+    }
+
+    $wp_filter[ $tag ]->do_action( $arg );
 
     array_pop( $wp_current_filter );