Changeset 11217

Timestamp:

05/06/2009 04:19:40 PM (16 years ago)

Author:

ryan

Message:

Default password nag fixes. Props DD32. fixes #9710

File:

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

trunk/wp-admin/includes/user.php

@@ -793 +793 @@
 
 add_action('admin_init', 'default_password_nag_handler');
-function default_password_nag_handler() {
+function default_password_nag_handler($errors = false) {
+    global $user_ID;
+    if ( ! get_usermeta($user_ID, 'default_password_nag') ) //Short circuit it.
+        return;
+
+    //get_user_setting = JS saved UI setting. else no-js-falback code.
     if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {     
-        global $user_ID;
         delete_user_setting('default_password_nag');
         update_usermeta($user_ID, 'default_password_nag', false);
     }
 }
+
+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_usermeta($user_ID, 'default_password_nag') ) //Short circuit it.
+        return;
+
+    $new_data = get_userdata($user_ID);
+
+    if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
+        delete_user_setting('default_password_nag');
+        update_usermeta($user_ID, 'default_password_nag', false);
+    }
+}
+
 add_action('admin_notices', 'default_password_nag');
 function default_password_nag() {