Changeset 4177

Timestamp:

09/08/2006 11:19:29 PM (19 years ago)

Author:

ryan

Message:

do_action and apply_filters arg passing sanity from mdawaffe. fixes #3116

File:

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

trunk/wp-includes/plugin.php

@@ -27 +27 @@
     global $wp_filter;
 
-    $args = array_slice(func_get_args(), 2);
+    $args = array($string);
+    for ( $a = 2; $a < func_num_args(); $a++ )
+        $args[] = func_get_arg($a);
 
     merge_filters($tag);
@@ -38 +40 @@
             foreach($functions as $function) {
 
-                $all_args = array_merge(array($string), $args);
                 $function_name = $function['function'];
                 $accepted_args = $function['accepted_args'];
 
-                if ( $accepted_args == 1 )
-                    $the_args = array($string);
-                elseif ( $accepted_args > 1 )
-                    $the_args = array_slice($all_args, 0, $accepted_args);
+                if ( $accepted_args > 0 )
+                    $the_args = array_slice($args, 0, $accepted_args);
                 elseif ( $accepted_args == 0 )
                     $the_args = NULL;
                 else
-                    $the_args = $all_args;
+                    $the_args = $args;
 
                 $string = call_user_func_array($function_name, $the_args);
@@ -103 +102 @@
 function do_action($tag, $arg = '') {
     global $wp_filter;
-    $args = array($arg);
+    $args = array();
+    if ( is_array($arg) && 1 == count($arg) && is_object($arg[0]) ) // array(&$this)
+        $args[] =& $arg[0];
+    else
+        $args[] = $arg;
     for ( $a = 2; $a < func_num_args(); $a++ )
-        $args[] = func_get_args($a);
+        $args[] = func_get_arg($a);
 
     merge_filters($tag);
@@ -119 +122 @@
                 $accepted_args = $function['accepted_args'];
 
-                if ( $accepted_args == 1 ) {
-                    $the_args = array($arg);
-                } elseif ( $accepted_args > 1 ) {
+                if ( $accepted_args > 0 )
                     $the_args = array_slice($args, 0, $accepted_args);
-                } elseif ( $accepted_args == 0 ) {
+                elseif ( $accepted_args == 0 )
                     $the_args = NULL;
-                } else {
+                else
                     $the_args = $args;
-                }
 
                 $string = call_user_func_array($function_name, $the_args);