Ticket #27093: 27093.patch

src/wp-admin/install.php

@@ -78 +78 @@
  */
 function display_setup_form( $error = null ) {
         global $wpdb;
-        $user_table = ( $wpdb->get_var("SHOW TABLES LIKE '$wpdb->users'") != null );
 
         // Ensure that Blogs appear in search engines by default
         $blog_public = 1;
@@ -103 +102 @@
                 <tr>
                         <th scope="row"><label for="user_login"><?php _e('Username'); ?></label></th>
                         <td>
-                        <?php
-                        if ( $user_table ) {
-                                _e('User(s) already exists.');
-                        } else {
-                                ?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
+                                <input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
                                 <p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p>
-                        <?php
-                        } ?>
                         </td>
                 </tr>
-                <?php if ( ! $user_table ) : ?>
                 <tr>
                         <th scope="row">
                                 <label for="admin_password"><?php _e('Password, twice'); ?></label>
@@ -126 +118 @@
                                 <p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
                         </td>
                 </tr>
-                <?php endif; ?>
                 <tr>
                         <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
                         <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />