Changeset 24125

Timestamp:

04/29/2013 01:25:15 PM (13 years ago)

Author:

nacin

Message:

delete_user_setting() and remove_action() were getting called with too many args. props rlerdorf. see #24210.

Location:

trunk

Files:

• wp-admin/includes/user.php (modified) (1 diff)
• wp-includes/rewrite.php (modified) (1 diff)

trunk/wp-admin/includes/user.php

@@ -348 +348 @@
 
         if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
-                delete_user_setting('default_password_nag', $user_ID);
+                delete_user_setting('default_password_nag');
                 update_user_option($user_ID, 'default_password_nag', false, true);
         }

trunk/wp-includes/rewrite.php

@@ -90 +90 @@
         $hook = 'do_feed_' . $feedname;
         // Remove default function hook
-        remove_action($hook, $hook, 10, 1);
+        remove_action($hook, $hook);
         add_action($hook, $function, 10, 1);
         return $hook;