Changeset 5393

Timestamp:

05/04/2007 11:27:12 PM (18 years ago)

Author:

rob1n

Message:

Return based on whether the hook was removed or not. Props mdawaffe. fixes #4223

Note that this will almost definitely *not* affect existing implementations. The way most code is set up now is to just call remove_filter() or remove_action().

File:

• trunk/wp-includes/plugin.php (modified) (2 diffs)

trunk/wp-includes/plugin.php

@@ -98 +98 @@
  */
 function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-    global $wp_filter, $merged_filters;
-
-    unset($GLOBALS['wp_filter'][$tag][$priority][serialize($function_to_remove)]);
-    unset( $merged_filters[ $tag ] );
-
-    return true;
+    $function_to_remove = serialize($function_to_remove);
+
+    $r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
+
+    unset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
+    unset($GLOBALS['merged_filters'][$tag]);
+
+    return $r;
 }
 
@@ -217 +219 @@
  */
 function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-    remove_filter($tag, $function_to_remove, $priority, $accepted_args);
+    return remove_filter($tag, $function_to_remove, $priority, $accepted_args);
 }