From c07f397c043b13da9fecaeb552a9dc0ec8ce3fd6 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Wed, 6 May 2009 16:19:40 +0000 Subject: [PATCH] Default password nag fixes. Props DD32. fixes #9710 git-svn-id: https://develop.svn.wordpress.org/trunk@11217 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/user.php | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 0ba4ad508f..20318f718a 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -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;