Index: wp-admin/setup-config.php =================================================================== --- wp-admin/setup-config.php (revision 16800) +++ wp-admin/setup-config.php (working copy) @@ -88,7 +88,7 @@ - +

WordPress

+ +

+

Below you should enter your database connection details. If you're not sure about these, contact your host.

- + - + - + - + - +
The name of the database you want to run WP in.
Your MySQL username
...and MySQL password.
You should be able to get this info from your web host, if localhost does not work.
If you want to run multiple WordPress installations in a single database, change this.
@@ -154,33 +184,50 @@ case 2: $dbname = trim($_POST['dbname']); $uname = trim($_POST['uname']); - $passwrd = trim($_POST['pwd']); + $password = trim($_POST['pwd']); $dbhost = trim($_POST['dbhost']); $prefix = trim($_POST['prefix']); if ( empty($prefix) ) - $prefix = 'wp_'; - + $prefix = 'wp_'; + $setup_error = null; // Validate $prefix: it can only contain letters, numbers and underscores - if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) - wp_die( /*WP_I18N_BAD_PREFIX*/'ERROR: "Table Prefix" can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/ ); + if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) { + $prefix = htmlspecialchars( $prefix, ENT_QUOTES ); + $setup_error = new WP_Error( 'invalid_prefix', 'ERROR: "Table Prefix" can only contain numbers, letters, and underscores.' ); + } + // prefix is good, let's continue + else { + // Test the db connection. + /**#@+ + * @ignore + */ + define('DB_NAME', $dbname); + define('DB_USER', $uname); + define('DB_PASSWORD', $password); + define('DB_HOST', $dbhost); + /**#@-*/ - // Test the db connection. - /**#@+ - * @ignore - */ - define('DB_NAME', $dbname); - define('DB_USER', $uname); - define('DB_PASSWORD', $passwrd); - define('DB_HOST', $dbhost); - /**#@-*/ - - // We'll fail here if the values are no good. - require_wp_db(); - if ( ! empty( $wpdb->error ) ) { - $back = '

Try Again

'; - wp_die( $wpdb->error->get_error_message() . $back ); - } - + // We'll fail here if the values are no good. + require_wp_db(); + if ( ! empty( $wpdb->error ) ) { + $setup_error = $wpdb->error; + } + } + // check if any error occured above + if ( $setup_error->get_error_code() ) { + $try_again = '

+ + + + + + + + +

+

'; + wp_die( $setup_error->get_error_message() . $try_again ); + } // Fetch or generate keys and salts. $no_api = isset( $_POST['noapi'] ); require_once( ABSPATH . WPINC . '/plugin.php' ); @@ -223,7 +270,7 @@ $configFile[$line_num] = str_replace("'username_here'", "'$uname'", $line); break; case "define('DB_PASSW": - $configFile[$line_num] = str_replace("'password_here'", "'$passwrd'", $line); + $configFile[$line_num] = str_replace("'password_here'", "'$password'", $line); break; case "define('DB_HOST'": $configFile[$line_num] = str_replace("localhost", $dbhost, $line);