Changeset 21287 for trunk/wp-includes/plugin.php

Timestamp:

07/20/2012 05:25:37 AM (13 years ago)

Author:

nacin

Message:

Remove unnecessary is_null() checks from the worker loops inside do_action(), apply_filters(), etc. fixes #21321. see #21169.

File:

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

trunk/wp-includes/plugin.php

@@ -165 +165 @@
 
     do {
-        foreach( (array) current($wp_filter[$tag]) as $the_ )
-            if ( !is_null($the_['function']) ){
-                $args[1] = $value;
-                $value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
-            }
-
+        foreach( (array) current($wp_filter[$tag]) as $the_ ) {
+            $args[1] = $value;
+            $value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
+        }
     } while ( next($wp_filter[$tag]) !== false );
 
@@ -223 +221 @@
 
     do {
-        foreach( (array) current($wp_filter[$tag]) as $the_ )
-            if ( !is_null($the_['function']) )
-                $args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
-
+        foreach( (array) current($wp_filter[$tag]) as $the_ ) {
+            $args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+        }
     } while ( next($wp_filter[$tag]) !== false );
 
@@ -264 +261 @@
         if ( empty($GLOBALS['wp_filter'][$tag][$priority]) )
             unset($GLOBALS['wp_filter'][$tag][$priority]);
+        if ( empty( $GLOBALS['wp_filter'][ $tag ] ) )
+            unset( $GLOBALS['wp_filter'][ $tag ] );
         unset($GLOBALS['merged_filters'][$tag]);
     }
@@ -399 +398 @@
 
     do {
-        foreach ( (array) current($wp_filter[$tag]) as $the_ )
-            if ( !is_null($the_['function']) )
-                call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
-
+        foreach ( (array) current($wp_filter[$tag]) as $the_ ) {
+            call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+        }
     } while ( next($wp_filter[$tag]) !== false );
 
@@ -480 +478 @@
 
     do {
-        foreach( (array) current($wp_filter[$tag]) as $the_ )
-            if ( !is_null($the_['function']) )
-                call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
-
+        foreach( (array) current($wp_filter[$tag]) as $the_ ) {
+            call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+        }
     } while ( next($wp_filter[$tag]) !== false );
 
@@ -710 +707 @@
     reset( $wp_filter['all'] );
     do {
-        foreach( (array) current($wp_filter['all']) as $the_ )
-            if ( !is_null($the_['function']) )
-                call_user_func_array($the_['function'], $args);
-
+        foreach( (array) current($wp_filter['all']) as $the_ ) {
+            call_user_func_array($the_['function'], $args);
+        }
     } while ( next($wp_filter['all']) !== false );
 }