golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@14608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-05-13 21:08:01 +00:00
parent 08fc51b214
commit 50b197cf94
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/user.php
View File

@ -834,14 +834,13 @@ function default_password_nag_handler($errors = 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_user_option('default_password_nag') ) //Short circuit it.
if ( ! get_user_option('default_password_nag', $user_ID) ) //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');
delete_user_setting('default_password_nag', $user_ID);
update_user_option($user_ID, 'default_password_nag', false, true);
}
}