Changeset 12983

Timestamp:

02/06/2010 06:20:38 AM (15 years ago)

Author:

dd32

Message:

Switch to *_user_option() for default password nag to avoid extra DB queries. Fixes #11380

Location:

trunk

Files:

• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/includes/user.php (modified) (5 diffs)
• wp-login.php (modified) (1 diff)

trunk/wp-admin/includes/upgrade.php

@@ -65 +65 @@
         $message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
         $user_id = wp_create_user($user_name, $random_password, $user_email);
-        update_usermeta($user_id, 'default_password_nag', true);
+        update_user_option($user_id, 'default_password_nag', true, true);
     } else {
         $random_password = '';

trunk/wp-admin/includes/user.php

@@ -808 +808 @@
 function default_password_nag_handler($errors = false) {
     global $user_ID;
-    if ( ! get_usermeta($user_ID, 'default_password_nag') ) //Short circuit it.
+    if ( ! get_user_option('default_password_nag') ) //Short circuit it.
         return;
 
@@ -814 +814 @@
     if ( '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_user_option($user_ID, 'default_password_nag', false, true);
     }
 }
@@ -821 +821 @@
 function default_password_nag_edit_user($user_ID, $old_data) {
     global $user_ID;
-    if ( ! get_usermeta($user_ID, 'default_password_nag') ) //Short circuit it.
+    if ( ! get_user_option('default_password_nag') ) //Short circuit it.
         return;
 
@@ -828 +828 @@
     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_user_option($user_ID, 'default_password_nag', false, true);
     }
 }
@@ -834 +834 @@
 add_action('admin_notices', 'default_password_nag');
 function default_password_nag() {
-    global $user_ID;
-    if ( ! get_usermeta($user_ID, 'default_password_nag') )
+    if ( ! get_user_option('default_password_nag') ) //Short circuit it.
         return;
 

trunk/wp-login.php

@@ -243 +243 @@
 
     wp_set_password($new_pass, $user->ID);
-    update_usermeta($user->ID, 'default_password_nag', true); //Set up the Password change nag.
+    update_user_option($user_ID, 'default_password_nag', true, true); //Set up the Password change nag.
     $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
     $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";