WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plugins: In `_wp_filter_build_unique_id()`, remove `$wp_filter` global and `$filter_id_count` static variable, unused since [46220]. 

See #47407, #48074.
Built from https://develop.svn.wordpress.org/trunk@46805


git-svn-id: http://core.svn.wordpress.org/trunk@46605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-11-29 22:14:01 +00:00
parent 1d1c74385f
commit 3047531f6a
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/plugin.php
View File

@ -902,19 +902,13 @@ function _wp_call_all_hook( $args ) {
* and the function always returns a string. * and the function always returns a string.
* @access private * @access private
* *
* @global array $wp_filter Stores all of the filters and actions.
* @staticvar int $filter_id_count
*
* @param string $tag Unused. The name of the filter to build ID for. * @param string $tag Unused. The name of the filter to build ID for.
* @param callable $function The function to generate ID for. * @param callable $function The function to generate ID for.
* @param int $priority Unused. The order in which the functions associated * @param int $priority Unused. The order in which the functions
* with a particular action are executed. * associated with a particular action are executed.
* @return string Unique ID for usage as array key. * @return string Unique function ID for usage as array key.
*/ */
function _wp_filter_build_unique_id( $tag, $function, $priority ) { function _wp_filter_build_unique_id( $tag, $function, $priority ) {
global $wp_filter;
static $filter_id_count = 0;
if ( is_string( $function ) ) { if ( is_string( $function ) ) {
return $function; return $function;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-46804'; $wp_version = '5.4-alpha-46805';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.