Changeset 14608 for trunk/wp-admin/includes/user.php

Timestamp:

05/13/2010 09:08:01 PM (14 years ago)

Author:

westi

Message:

Fix the default password nag clearer to work when an admin sets someone elses password away from the default. Fixes #12334.

File:

• trunk/wp-admin/includes/user.php (modified) (2 diffs)

trunk/wp-admin/includes/user.php

@@ -835 +835 @@
 add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
 function default_password_nag_edit_user($user_ID, $old_data) {
-    global $user_ID;
-    if ( ! get_user_option('default_password_nag') ) //Short circuit it.
+    if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
         return;
 
@@ -842 +841 @@
 
     if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
-        delete_user_setting('default_password_nag');
+        delete_user_setting('default_password_nag', $user_ID);
         update_user_option($user_ID, 'default_password_nag', false, true);
     }