Ticket #21169: next-to-each-22075.patch

wp-includes/plugin.php

@@ -166 +166 @@
         if ( empty($args) )
                 $args = func_get_args();
 
-        do {
-                foreach( (array) current($wp_filter[$tag]) as $the_ )
+        while ( ( $next = each($wp_filter[$tag]) ) !== false ) {
+                foreach( $next['value'] 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']));
                         }
+        }
 
-        } while ( next($wp_filter[$tag]) !== false );
-
         array_pop( $wp_current_filter );
 
         return $value;
@@ -224 +223 @@
 
         reset( $wp_filter[ $tag ] );
 
-        do {
-                foreach( (array) current($wp_filter[$tag]) as $the_ )
+        while ( ( $next = each($wp_filter[$tag]) ) !== false ) {
+                foreach( $next['value'] as $the_ )
                         if ( !is_null($the_['function']) )
                                 $args[0] = 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 );
 
         return $args[0];
@@ -400 +398 @@
 
         reset( $wp_filter[ $tag ] );
 
-        do {
-                foreach ( (array) current($wp_filter[$tag]) as $the_ )
+        while ( ( $next = each($wp_filter[$tag]) ) !== false ) {
+                foreach( $next['value'] as $the_ )
                         if ( !is_null($the_['function']) )
                                 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);
 }
 
@@ -481 +478 @@
 
         reset( $wp_filter[ $tag ] );
 
-        do {
-                foreach( (array) current($wp_filter[$tag]) as $the_ )
+        while ( ( $next = each($wp_filter[$tag]) ) !== false ) {
+                foreach( $next['value'] as $the_ )
                         if ( !is_null($the_['function']) )
                                 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);
 }
 
@@ -713 +709 @@
         global $wp_filter;
 
         reset( $wp_filter['all'] );
-        do {
-                foreach( (array) current($wp_filter['all']) as $the_ )
+        while ( ( $next = each($wp_filter['all']) ) !== false ) {
+                foreach( $next['value'] as $the_ )
                         if ( !is_null($the_['function']) )
                                 call_user_func_array($the_['function'], $args);
-
-        } while ( next($wp_filter['all']) !== false );
+        }
 }
 
 /**