Ticket #11380: 11380.diff

wp-admin/includes/user.php

@@ -792 +792 @@
 add_action('admin_init', '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.
+        if ( get_usermeta($user_ID, 'default_password_nag') === array() ) //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'] ) {
+        if ( ! get_usermeta($user_ID, 'default_password_nag') || 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
                 delete_user_setting('default_password_nag');
-                update_usermeta($user_ID, 'default_password_nag', false);
+                update_usermeta($user_ID, 'default_password_nag', array());
+                dump(get_usermeta($user_ID, 'default_password_nag'));
         }
 }
 
@@ -812 +813 @@
 
         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);
+                update_usermeta($user_ID, 'default_password_nag', array());
         }
 }