From a86711e28ed6f90dfec3e581d36e3e9a1bbb71d7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 16 Sep 2019 14:48:54 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@46149


git-svn-id: http://core.svn.wordpress.org/trunk@45961 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/plugin.php  | 16 +++++++---------
 wp-includes/version.php |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 3e021bbdd8..1f6cacd5b4 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -448,10 +448,11 @@ function do_action( $tag, $arg = '' ) {
 		++$wp_actions[ $tag ];
 	}
 
+	$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 );
 	}
 
@@ -466,14 +467,11 @@ function do_action( $tag, $arg = '' ) {
 		$wp_current_filter[] = $tag;
 	}
 
-	$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( '' );
 	}
 
 	$wp_filter[ $tag ]->do_action( $args );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c4f1f3a367..fdd043c25d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46148';
+$wp_version = '5.3-alpha-46149';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.