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

After [28883], `remove_filter()` should set `$GLOBALS['wp_filter'][ $tag ]` to `array()` when empty. 

Props wonderboymusic, sphoid.
Fixes #28142.

Built from https://develop.svn.wordpress.org/trunk@28884


git-svn-id: http://core.svn.wordpress.org/trunk@28683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-06-28 04:38:15 +00:00
parent 9275c87190
commit 0289b98648
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/plugin.php
View File

@ -273,15 +273,19 @@ function apply_filters_ref_array($tag, $args) {
* @return boolean Whether the function existed before it was removed. * @return boolean Whether the function existed before it was removed.
*/ */
function remove_filter( $tag, $function_to_remove, $priority = 10 ) { function remove_filter( $tag, $function_to_remove, $priority = 10 ) {
$function_to_remove = _wp_filter_build_unique_id($tag, $function_to_remove, $priority); $function_to_remove = _wp_filter_build_unique_id( $tag, $function_to_remove, $priority );
$r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]); $r = isset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] );
if ( true === $r) { if ( true === $r ) {
unset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]); unset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] );
if ( empty($GLOBALS['wp_filter'][$tag][$priority]) ) if ( empty( $GLOBALS['wp_filter'][ $tag ][ $priority ] ) ) {
unset($GLOBALS['wp_filter'][$tag][$priority]); unset( $GLOBALS['wp_filter'][ $tag ][ $priority ] );
unset($GLOBALS['merged_filters'][$tag]); }
if ( empty( $GLOBALS['wp_filter'][ $tag ] ) ) {
$GLOBALS['wp_filter'][ $tag ] = array();
}
unset( $GLOBALS['merged_filters'][ $tag ] );
} }
return $r; return $r;