Changeset 4186

Timestamp:

09/12/2006 05:45:23 PM (18 years ago)

Author:

ryan

Message:

do_action_ref_array(). fixes #3125

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (1 diff)
• wp-includes/classes.php (modified) (3 diffs)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/plugin.php (modified) (2 diffs)
• wp-includes/query.php (modified) (3 diffs)
• wp-includes/rewrite.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -476 +476 @@
 
     /* checking the password has been typed twice */
-    do_action('check_passwords', array ($user->user_login, & $pass1, & $pass2));
+    do_action_ref_array('check_passwords', array ($user->user_login, & $pass1, & $pass2));
 
     if (!$update) {

trunk/wp-includes/classes.php

@@ -229 +229 @@
         $this->query_vars = apply_filters('request', $this->query_vars);
 
-        do_action('parse_request', array(&$this));
+        do_action_ref_array('parse_request', array(&$this));
     }
 
@@ -271 +271 @@
         }
 
-        do_action('send_headers', array(&$this));
+        do_action_ref_array('send_headers', array(&$this));
     }
 
@@ -339 +339 @@
         $this->handle_404();
         $this->register_globals();
-        do_action('wp', array(&$this));
+        do_action_ref_array('wp', array(&$this));
     }
 

trunk/wp-includes/comment.php

@@ -696 +696 @@
     endforeach;
 
-    do_action('pre_ping',  array(&$post_links, &$pung));
+    do_action_ref_array('pre_ping',  array(&$post_links, &$pung));
 
     foreach ($post_links as $pagelinkedto){

trunk/wp-includes/plugin.php

@@ -112 +112 @@
     merge_filters($tag);
 
-    if ( !isset($wp_filter[$tag]) ) {
+    if ( !isset($wp_filter[$tag]) )
         return;
-    }
+
     foreach ($wp_filter[$tag] as $priority => $functions) {
         if ( !is_null($functions) ) {
@@ -129 +129 @@
                     $the_args = $args;
 
-                $string = call_user_func_array($function_name, $the_args);
+                call_user_func_array($function_name, $the_args);
+            }
+        }
+    }
+}
+
+function do_action_ref_array($tag, $args) {
+    global $wp_filter;
+
+    merge_filters($tag);
+
+    if ( !isset($wp_filter[$tag]) )
+        return;
+
+    foreach ($wp_filter[$tag] as $priority => $functions) {
+        if ( !is_null($functions) ) {
+            foreach($functions as $function) {
+
+                $function_name = $function['function'];
+                $accepted_args = $function['accepted_args'];
+
+                if ( $accepted_args > 0 )
+                    $the_args = array_slice($args, 0, $accepted_args);
+                elseif ( $accepted_args == 0 )
+                    $the_args = NULL;
+                else
+                    $the_args = $args;
+
+                call_user_func_array($function_name, $the_args);
             }
         }

trunk/wp-includes/query.php

@@ -351 +351 @@
             $this->is_404 = true;
             if ( !empty($query) ) {
-                do_action('parse_query', array(&$this));
+                do_action_ref_array('parse_query', array(&$this));
             }
             return;
@@ -499 +499 @@
 
         if ( !empty($query) ) {
-            do_action('parse_query', array(&$this));
+            do_action_ref_array('parse_query', array(&$this));
         }
     }
@@ -527 +527 @@
         global $wpdb, $pagenow, $user_ID;
 
-        do_action('pre_get_posts', array(&$this));
+        do_action_ref_array('pre_get_posts', array(&$this));
 
         // Shorthand.

trunk/wp-includes/rewrite.php

@@ -736 +736 @@
         $this->rules = array_merge($robots_rewrite, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
 
-        do_action('generate_rewrite_rules', array(&$this));
+        do_action_ref_array('generate_rewrite_rules', array(&$this));
         $this->rules = apply_filters('rewrite_rules_array', $this->rules);
 

trunk/wp-login.php

@@ -189 +189 @@
     }
 
-    do_action('wp_authenticate', array(&$user_login, &$user_pass));
+    do_action_ref_array('wp_authenticate', array(&$user_login, &$user_pass));
 
     if ( $user_login && $user_pass ) {