Changeset 6318

Timestamp:

11/06/2007 09:38:04 PM (19 years ago)

Author:

ryan

Message:

current_fiter() from tellyworth. fixes #5232

File:

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

trunk/wp-includes/plugin.php

@@ -108 +108 @@
  */
 function apply_filters($tag, $value) {
-        global $wp_filter, $merged_filters;
+        global $wp_filter, $merged_filters, $wp_current_filter;
+
+        @$wp_current_filter[] = $tag;
 
         // Do 'all' actions first
@@ -121 +123 @@
         }
 
-        if ( !isset($wp_filter[$tag]) )
+        if ( !isset($wp_filter[$tag]) ) {
+                array_pop($wp_current_filter);
                 return $value;
+        }
 
         // Sort
@@ -143 +147 @@
 
         } while ( next($wp_filter[$tag]) !== false );
+        
+        array_pop( $wp_current_filter );
 
         return $value;
@@ -183 +189 @@
 
 /**
+ * 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.
  *
@@ -234 +249 @@
  */
 function do_action($tag, $arg = '') {
-        global $wp_action, $wp_actions;
+        global $wp_action, $wp_actions, $wp_current_filter;
 
         if ( is_array($wp_actions) )
@@ -249 +264 @@
                 $args[] = func_get_arg($a);
 
+        @$wp_current_filter[] = $tag;
+
         // Do 'all' actions first
         if ( isset($wp_action['all']) ) {
@@ -259 +276 @@
         }
 
-        if ( !isset($wp_action[$tag]) )
+        if ( !isset($wp_action[$tag]) ) {
+                array_pop($wp_current_filter);
                 return;
-
+        }
+                
         // Sort
         if ( !isset( $merged_actions[ $tag ] ) ) {
@@ -278 +297 @@
         } while ( next($wp_action[$tag]) !== false );
 
+                array_pop($wp_current_filter);
 }