Changeset 13592 for trunk/wp-admin/includes/upgrade.php

Timestamp:

03/05/2010 12:25:30 PM (14 years ago)

Author:

dd32

Message:

Do not display user specified password during install. Fixes #12479. See #10396 for feedback

File:

• trunk/wp-admin/includes/upgrade.php (modified) (3 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -63 +63 @@
     $user_id = username_exists($user_name);
     $user_password = trim($user_password);
+    $email_password = false;
     if ( !$user_id && empty($user_password) ) {
         $user_password = wp_generate_password();
@@ -68 +69 @@
         $user_id = wp_create_user($user_name, $user_password, $user_email);
         update_user_option($user_id, 'default_password_nag', true);
+        $email_password = true;
     } else if ( !$user_id ) {
-        $message = __('<strong><em>Note that password</em></strong> carefully!');
+        // Password has been provided
+        $message = __('<em>Your chosen password.</em>');
         $user_id = wp_create_user($user_name, $user_password, $user_email);
     } else {
-        $message =  __('User already exists.  Password inherited.');
+        $message =  __('User already exists. Password inherited.');
     }
 
@@ -82 +85 @@
     $wp_rewrite->flush_rules();
 
-    wp_new_blog_notification($blog_title, $guessurl, $user_id, $user_password);
+    wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
 
     wp_cache_flush();