Ticket #5232: wp-current-filter-revised-r6278.patch

wordpress/wp-includes/plugin.php

@@ -107 +107 @@
  * @return string The text in <tt>$string</tt> after all hooked functions are applied to it.
  */
 function apply_filters($tag, $value) {
-        global $wp_filter, $merged_filters;
+        global $wp_filter, $merged_filters, $wp_current_filter;
 
         if ( !isset( $merged_filters[ $tag ] ) )
                 merge_filters($tag);
 
         if ( !isset($wp_filter[$tag]) )
                 return $value;
+                
+        @$wp_current_filter[] = $tag;
 
         reset( $wp_filter[ $tag ] );
 
@@ -127 +129 @@
                         }
 
         } while ( next($wp_filter[$tag]) !== false );
+        
+        array_pop( $wp_current_filter );
 
         return $value;
 }
@@ -196 +200 @@
 }
 
 /**
+ * Return the name of the current filter or action.
+ */
+function current_filter() {
+        global $wp_current_filter;
+        return end( $wp_current_filter );
+}
+
+
+/**
  * Hooks a function on to a specific action.
  *
  * Actions are the hooks that the WordPress core launches at specific points
@@ -241 +254 @@
  * @return null Will return null if $tag does not exist in $wp_filter array
  */
 function do_action($tag, $arg = '') {
-        global $wp_filter, $wp_actions;
+        global $wp_filter, $wp_actions, $wp_current_filter;
 
         if ( is_array($wp_actions) )
                 $wp_actions[] = $tag;
@@ -260 +273 @@
 
         if ( !isset($wp_filter[$tag]) )
                 return;
+                
+        @$wp_current_filter[] = $tag;
 
         do{
                 foreach( (array) current($wp_filter[$tag]) as $the_ )
@@ -267 +282 @@
                                 call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
 
         } while ( next($wp_filter[$tag]) !== false );
+        
+        array_pop( $wp_current_filter );
 
 }