Changeset 17638

Timestamp:

04/14/2011 06:05:30 PM (16 years ago)

Author:

ryan

Message:

Avoid array push/pops for empty filters and actions. fixes #17110

File:

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

trunk/wp-includes/plugin.php

@@ -136 +136 @@
 
         $args = array();
-        $wp_current_filter[] = $tag;
 
         // Do 'all' actions first
         if ( isset($wp_filter['all']) ) {
+                $wp_current_filter[] = $tag;
                 $args = func_get_args();
                 _wp_call_all_hook($args);
@@ -145 +145 @@
 
         if ( !isset($wp_filter[$tag]) ) {
-                array_pop($wp_current_filter);
+                if ( isset($wp_filter['all']) )
+                        array_pop($wp_current_filter);
                 return $value;
         }
+
+        if ( !isset($wp_filter['all']) )
+                $wp_current_filter[] = $tag;
 
         // Sort
@@ -194 +198 @@
         global $wp_filter, $merged_filters, $wp_current_filter;
 
-        $wp_current_filter[] = $tag;
-
         // Do 'all' actions first
         if ( isset($wp_filter['all']) ) {
+                $wp_current_filter[] = $tag;
                 $all_args = func_get_args();
                 _wp_call_all_hook($all_args);
@@ -203 +206 @@
 
         if ( !isset($wp_filter[$tag]) ) {
-                array_pop($wp_current_filter);
+                if ( isset($wp_filter['all']) )
+                        array_pop($wp_current_filter);
                 return $args[0];
         }
+
+        if ( !isset($wp_filter['all']) )
+                $wp_current_filter[] = $tag;
 
         // Sort
@@ -361 +368 @@
                 ++$wp_actions[$tag];
 
-        $wp_current_filter[] = $tag;
-
         // Do 'all' actions first
         if ( isset($wp_filter['all']) ) {
+                $wp_current_filter[] = $tag;
                 $all_args = func_get_args();
                 _wp_call_all_hook($all_args);
@@ -370 +376 @@
 
         if ( !isset($wp_filter[$tag]) ) {
-                array_pop($wp_current_filter);
+                if ( isset($wp_filter['all']) )
+                        array_pop($wp_current_filter);
                 return;
         }
+
+        if ( !isset($wp_filter['all']) )
+                $wp_current_filter[] = $tag;
 
         $args = array();
@@ -447 +457 @@
                 ++$wp_actions[$tag];
 
-        $wp_current_filter[] = $tag;
-
         // Do 'all' actions first
         if ( isset($wp_filter['all']) ) {
+                $wp_current_filter[] = $tag;
                 $all_args = func_get_args();
                 _wp_call_all_hook($all_args);
@@ -456 +465 @@
 
         if ( !isset($wp_filter[$tag]) ) {
-                array_pop($wp_current_filter);
+                if ( isset($wp_filter['all']) )
+                        array_pop($wp_current_filter);
                 return;
         }
+
+        if ( !isset($wp_filter['all']) )
+                $wp_current_filter[] = $tag;
 
         // Sort