Default password nag fixes. Props DD32. fixes #9710
git-svn-id: http://svn.automattic.com/wordpress/trunk@11217 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
e15c230205
commit
185d659b85
|
@ -792,13 +792,32 @@ class WP_User_Search {
|
|||
endif;
|
||||
|
||||
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() {
|
||||
global $user_ID;
|
||||
|
|
Loading…
Reference in New Issue