Index: wp-admin/setup-config.php =================================================================== --- wp-admin/setup-config.php (revision 18456) +++ wp-admin/setup-config.php (working copy) @@ -35,34 +35,34 @@ * the database class while being wp-content/db.php aware. * @ignore */ -define('ABSPATH', dirname(dirname(__FILE__)).'/'); -define('WPINC', 'wp-includes'); -define('WP_CONTENT_DIR', ABSPATH . 'wp-content'); -define('WP_DEBUG', false); +define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' ); +define( 'WPINC', 'wp-includes' ); +define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); +define( 'WP_DEBUG', false ); /**#@-*/ -require_once(ABSPATH . WPINC . '/load.php'); -require_once(ABSPATH . WPINC . '/version.php'); +require_once( ABSPATH . WPINC . '/load.php' ); +require_once( ABSPATH . WPINC . '/version.php' ); wp_check_php_mysql_versions(); -require_once(ABSPATH . WPINC . '/compat.php'); -require_once(ABSPATH . WPINC . '/functions.php'); -require_once(ABSPATH . WPINC . '/class-wp-error.php'); +require_once( ABSPATH . WPINC . '/compat.php' ); +require_once( ABSPATH . WPINC . '/functions.php' ); +require_once( ABSPATH . WPINC . '/class-wp-error.php' ); -if (!file_exists(ABSPATH . 'wp-config-sample.php')) - wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'); +if ( ! file_exists( ABSPATH . 'wp-config-sample.php' ) ) + wp_die( /*WP_I18N_SETUP_NO_SAMPLE*/'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'/*/WP_I18N_SETUP_NO_SAMPLE*/ ); -$configFile = file(ABSPATH . 'wp-config-sample.php'); +$configFile = file( ABSPATH . 'wp-config-sample.php' ); // Check if wp-config.php has been created -if (file_exists(ABSPATH . 'wp-config.php')) - wp_die("

The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now.

"); +if ( file_exists( ABSPATH . 'wp-config.php' ) ) + wp_die( '

' . /*WP_I18N_SETUP_CONFIG_EXISTS*/"The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now."/*/WP_I18N_SETUP_CONFIG_EXISTS*/ . '

' ); // Check if wp-config.php exists above the root directory but is not part of another install -if (file_exists(ABSPATH . '../wp-config.php') && ! file_exists(ABSPATH . '../wp-settings.php')) - wp_die("

The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now.

"); +if ( file_exists( ABSPATH . '../wp-config.php') && ! file_exists( ABSPATH . '../wp-settings.php' ) ) + wp_die( '

' . /*WP_I18N_SETUP_CONFIG_EXISTS_UP*/"The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now."/*/WP_I18N_SETUP_CONFIG_EXISTS_UP*/ . '

' ); -if (isset($_GET['step'])) +if ( isset( $_GET['step'] ) ) $step = $_GET['step']; else $step = 0; @@ -82,7 +82,7 @@ -WordPress › Setup Configuration File +<?php echo /*WP_I18N_SETUP_TITLE*/'WordPress › Setup Configuration File'/*WP_I18N_SETUP_CONFIG_EXISTS*/; ?> @@ -96,18 +96,18 @@ display_header(); ?> -

Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.

+

    -
  1. Database name
    2. -
  2. Database username
    3. -
  3. Database password
    4. -
  4. Database host
    5. -
  5. Table prefix (if you want to run more than one WordPress in a single database)
    6. +
    7. +
    8. +
    9. +
    10. +
-

If for any reason this automatic file creation doesn't work, don't worry. All this does is fill in the database information to a configuration file. You may also simply open wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php.

-

In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready…

+

wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php."/*/WP_I18N_SETUP_NO_WORRIES*/; ?>

+

-

Let’s go!

+

-

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.localhost does not work.'/*/WP_I18N_SETUP_HOST_INFO*/; ?>
If you want to run multiple WordPress installations in a single database, change this.
-

+

error ) ) { - $back = '

Try Again

'; + $back = '

' . /*WP_I18N_SETUP_TRY_AGAIN*/'Try Again'/*/WP_I18N_SETUP_TRY_AGAIN*/ . '

'; wp_die( $wpdb->error->get_error_message() . $back ); } @@ -207,27 +207,27 @@ } else { $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) ); foreach ( $secret_keys as $k => $v ) { - $secret_keys[$k] = substr( $v, 28, 64 ); + $secret_keys[ $k ] = substr( $v, 28, 64 ); } } $key = 0; - foreach ($configFile as $line_num => $line) { - switch (substr($line,0,16)) { + foreach ( $configFile as $line_num => $line ) { + switch ( substr( $line, 0, 16 ) ) { case "define('DB_NAME'": - $configFile[$line_num] = str_replace("database_name_here", $dbname, $line); + $configFile[ $line_num ] = str_replace( "database_name_here", $dbname, $line ); break; case "define('DB_USER'": - $configFile[$line_num] = str_replace("'username_here'", "'$uname'", $line); + $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'", "'$passwrd'", $line ); break; case "define('DB_HOST'": - $configFile[$line_num] = str_replace("localhost", $dbhost, $line); + $configFile[ $line_num ] = str_replace( "localhost", $dbhost, $line ); break; case '$table_prefix =': - $configFile[$line_num] = str_replace('wp_', $prefix, $line); + $configFile[ $line_num ] = str_replace( 'wp_', $prefix, $line ); break; case "define('AUTH_KEY": case "define('SECURE_A": @@ -237,35 +237,35 @@ case "define('SECURE_A": case "define('LOGGED_I": case "define('NONCE_SA": - $configFile[$line_num] = str_replace('put your unique phrase here', $secret_keys[$key++], $line ); + $configFile[ $line_num ] = str_replace( 'put your unique phrase here', $secret_keys[ $key++ ], $line ); break; } } - if ( ! is_writable(ABSPATH) ) : + if ( ! is_writable( ABSPATH ) ) : display_header(); ?> -

Sorry, but I can't write the wp-config.php file.

-

You can create the wp-config.php manually and paste the following text into it.

+

wp-config.php file."/*/WP_I18N_SETUP_NO_INK*/; ?>

+

wp-config.php manually and paste the following text into it.'/*/WP_I18N_SETUP_PASTE*/; ?>

-

After you've done that, click "Run the install."

-

Run the install

+

+

-

All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…

+

-

Run the install

+