Changeset 28884

Timestamp:

06/28/2014 04:37:47 AM (12 years ago)

Author:

wonderboymusic

Message:

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

Props wonderboymusic, sphoid.
Fixes #28142.

File:

• trunk/src/wp-includes/plugin.php (modified) (1 diff)

trunk/src/wp-includes/plugin.php

@@ -274 +274 @@
  */
 function remove_filter( $tag, $function_to_remove, $priority = 10 ) {
-        $function_to_remove = _wp_filter_build_unique_id($tag, $function_to_remove, $priority);
-
-        $r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
-
-        if ( true === $r) {
-                unset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
-                if ( empty($GLOBALS['wp_filter'][$tag][$priority]) )
-                        unset($GLOBALS['wp_filter'][$tag][$priority]);
-                unset($GLOBALS['merged_filters'][$tag]);
+        $function_to_remove = _wp_filter_build_unique_id( $tag, $function_to_remove, $priority );
+
+        $r = isset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] );
+
+        if ( true === $r ) {
+                unset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] );
+                if ( empty( $GLOBALS['wp_filter'][ $tag ][ $priority ] ) ) {
+                        unset( $GLOBALS['wp_filter'][ $tag ][ $priority ] );
+                }
+                if ( empty( $GLOBALS['wp_filter'][ $tag ] ) ) {
+                        $GLOBALS['wp_filter'][ $tag ] = array();
+                }
+                unset( $GLOBALS['merged_filters'][ $tag ] );
         }