X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7688c6ba71852cd89123b62b2d57683535e4702a..11be8dc178e77d0b46189bbd8e33a216a9b90942:/wp-admin/setup-config.php diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index b4dae209..4b0b5649 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -1,6 +1,31 @@ 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.

"); +// Check if wp-config.php exists above the root directory +if (file_exists('../../wp-config.php') && ! file_exists('../../wp-load.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 (isset($_GET['step'])) $step = $_GET['step']; else $step = 0; -function display_header(){ +/** + * Display setup wp-config.php file header. + * + * @ignore + * @since 2.3.0 + * @package WordPress + * @subpackage Installer_WP_Config + */ +function display_header() { header( 'Content-Type: text/html; charset=utf-8' ); ?> -WordPress › Setup Configuration File -

WordPress

@@ -102,46 +89,45 @@ switch($step) {
  • Table prefix (if you want to run more than one WordPress in a single database)

    • 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 ISP. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready, let’s go!

    +

    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…

    + +

    Let’s go!

    -

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

    - +
    - - + + - - + + - - + + - - + + - - + +
    Database Name The name of the database you want to run WP in.
    User Name Your MySQL username
    Password ...and MySQL password.
    Database Host 99% chance you won't need to change this value.
    Table Prefix If you want to run multiple WordPress installations in a single database, change this.
    -

    - -

    +

    error) ) wp_die($wpdb->error->get_error_message()); @@ -190,14 +180,15 @@ switch($step) { } fclose($handle); chmod('../wp-config.php', 0666); - + display_header(); ?> -

    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!

    +

    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

    -