Ticket #5232: wp-current-filter-r6720.patch

wordpress/wp-includes/plugin.php

@@ -40 +40 @@
  * @return string The text in <tt>$string</tt> after all hooked functions are applied to it.
  */
 function apply_filters($tag, $string) {
-        global $wp_filter, $merged_filters;
+        global $wp_filter, $merged_filters, $wp_current_filter;
 
         if ( !isset( $merged_filters[ $tag ] ) )
                 merge_filters($tag);
@@ -51 +51 @@
         reset( $wp_filter[ $tag ] );
 
         $args = func_get_args();
+        
+        $last_filter = @$wp_current_filter;
+        $wp_current_filter = $tag;
 
         do{
                 foreach( (array) current($wp_filter[$tag]) as $the_ )
@@ -61 +64 @@
 
         } while ( next($wp_filter[$tag]) !== false );
 
+        $wp_current_filter = $last_filter;
+
         return $string;
 }
 
@@ -138 +143 @@
  * @param mixed $arg,... Optional additional arguments which are passed on to the functions hooked to the action.
  */
 function do_action($tag, $arg = '') {
-        global $wp_filter, $wp_actions;
+        global $wp_filter, $wp_actions, $wp_current_action;
 
         if ( is_array($wp_actions) )
                 $wp_actions[] = $tag;
@@ -158 +163 @@
         if ( !isset($wp_filter[$tag]) )
                 return;
 
+        $last_action = @$wp_current_action;
+        $wp_current_action = $tag;
+
         do{
                 foreach( (array) current($wp_filter[$tag]) as $the_ )
                         if ( !is_null($the_['function']) )
@@ -165 +173 @@
 
         } while ( next($wp_filter[$tag]) !== false );
 
+        $wp_current_action = $last_action;
 }
 
 /**