Changeset 4176

Timestamp:

09/08/2006 11:18:03 PM (17 years ago)

Author:

ryan

Message:

Specify number of accepted args.

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (1 diff)
• wp-includes/plugin.php (modified) (2 diffs)

trunk/wp-admin/admin-functions.php

@@ -2076 +2076 @@
 }
 
-add_action('update_option_home', 'update_home_siteurl');
-add_action('update_option_siteurl', 'update_home_siteurl');
+add_action('update_option_home', 'update_home_siteurl', 10, 2);
+add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
 
 ?>

trunk/wp-includes/plugin.php

@@ -103 +103 @@
 function do_action($tag, $arg = '') {
     global $wp_filter;
-    $extra_args = array_slice(func_get_args(), 2);
-    if ( is_array($arg) )
-        $args = array_merge($arg, $extra_args);
-    else
-        $args = array_merge(array($arg), $extra_args);
+    $args = array($arg);
+    for ( $a = 2; $a < func_num_args(); $a++ )
+        $args[] = func_get_args($a);
 
     merge_filters($tag);
@@ -122 +120 @@
 
                 if ( $accepted_args == 1 ) {
-                    if ( is_array($arg) )
-                        $the_args = $arg;
-                    else
-                        $the_args = array($arg);
+                    $the_args = array($arg);
                 } elseif ( $accepted_args > 1 ) {
                     $the_args = array_slice($args, 0, $accepted_args);