Changeset 11326

Timestamp:

05/14/2009 06:54:33 AM (15 years ago)

Author:

westi

Message:

Give better instructions when installing over an existing users table. Fixes #9569 based on patch from coffee2code.

Location:

trunk/wp-admin

Files:

• includes/upgrade.php (modified) (4 diffs)
• install.php (modified) (1 diff)

trunk/wp-admin/includes/upgrade.php

@@ -21 +21 @@
 if ( !function_exists('wp_install') ) :
 /**
- * {@internal Missing Short Description}}
+ * Installs the blog
  *
  * {@internal Missing Long Description}}
@@ -32 +32 @@
  * @param bool $public Whether blog is public.
  * @param null $deprecated Optional. Not used.
- * @return array Array keys 'url', 'user_id', 'password'.
+ * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
  */
 function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='') {
@@ -60 +60 @@
     if ( !$user_id ) {
         $random_password = wp_generate_password();
+        $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);
     } else {
-        $random_password = __('User already exists.  Password inherited.');
+        $random_password = '';
+        $message =  __('User already exists.  Password inherited.');
     }
 
@@ -77 +79 @@
     wp_cache_flush();
 
-    return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $random_password);
+    return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $random_password, 'password_message' => $message);
 }
 endif;

trunk/wp-admin/install.php

@@ -137 +137 @@
     <tr>
         <th><?php _e('Password'); ?></th>
-        <td><code><?php echo $password; ?></code><br />
-            <?php echo '<p>'.__('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.').'</p>'; ?></td>
+        <td><?php if ( !empty( $password ) ) {
+                        echo '<code>'. $password .'</code><br />';
+                    }
+                    echo '<p>'. $password_message .'</p>'; ?></td>
     </tr>
 </table>