diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 01b8f6a5f..33bd3bb65 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -35,9 +35,6 @@ if (!file_exists(ABSPATH . 'wp-config-sample.php')) $configFile = file(ABSPATH . 'wp-config-sample.php'); -if ( !is_writable(ABSPATH)) - wp_die("Sorry, I can't write to the directory. You'll have to either change the permissions on your WordPress directory or create your wp-config.php manually."); - // 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.

"); @@ -155,38 +152,52 @@ switch($step) { if ( !empty($wpdb->error) ) wp_die($wpdb->error->get_error_message()); - $handle = fopen(ABSPATH . 'wp-config.php', 'w'); - foreach ($configFile as $line_num => $line) { switch (substr($line,0,16)) { case "define('DB_NAME'": - fwrite($handle, str_replace("putyourdbnamehere", $dbname, $line)); + $configFile[$line_num] = str_replace("putyourdbnamehere", $dbname, $line); break; case "define('DB_USER'": - fwrite($handle, str_replace("'usernamehere'", "'$uname'", $line)); + $configFile[$line_num] = str_replace("'usernamehere'", "'$uname'", $line); break; case "define('DB_PASSW": - fwrite($handle, str_replace("'yourpasswordhere'", "'$passwrd'", $line)); + $configFile[$line_num] = str_replace("'yourpasswordhere'", "'$passwrd'", $line); break; case "define('DB_HOST'": - fwrite($handle, str_replace("localhost", $dbhost, $line)); + $configFile[$line_num] = str_replace("localhost", $dbhost, $line); break; case '$table_prefix =': - fwrite($handle, str_replace('wp_', $prefix, $line)); + $configFile[$line_num] = str_replace('wp_', $prefix, $line); break; - default: - fwrite($handle, $line); } } - fclose($handle); - chmod(ABSPATH . 'wp-config.php', 0666); - - display_header(); + 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.

+ +

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