From 3047531f6aa9d404e33ebfa1b8a57ac3fdafe9b8 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 29 Nov 2019 22:14:01 +0000 Subject: [PATCH] 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 --- wp-includes/plugin.php | 12 +++--------- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index ead5253404..83dfd4ac6e 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -902,19 +902,13 @@ function _wp_call_all_hook( $args ) { * and the function always returns a string. * @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 callable $function The function to generate ID for. - * @param int $priority Unused. The order in which the functions associated - * with a particular action are executed. - * @return string Unique ID for usage as array key. + * @param int $priority Unused. The order in which the functions + * associated with a particular action are executed. + * @return string Unique function ID for usage as array key. */ function _wp_filter_build_unique_id( $tag, $function, $priority ) { - global $wp_filter; - static $filter_id_count = 0; - if ( is_string( $function ) ) { return $function; } diff --git a/wp-includes/version.php b/wp-includes/version.php index dc9b5b499f..970c2e2dab 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @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.