sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Props jrf.
See #47678.

git-svn-id: https://develop.svn.wordpress.org/trunk@46149 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-09-16 14:47:53 +00:00
parent ea350997e6
commit 31fa37f06d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wp-includes/plugin.php
View File

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