Updates from Ryan to check for errors earlier in script and test DB connection.
git-svn-id: https://develop.svn.wordpress.org/trunk@758 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
09719d811c
commit
14d0557487
@ -1,6 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
$_wp_installing = 1;
|
$_wp_installing = 1;
|
||||||
if (file_exists('../wp-config.php')) 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.");
|
|
||||||
|
if (file_exists('../wp-config.php'))
|
||||||
|
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.");
|
||||||
|
|
||||||
|
if (!file_exists('../wp-config-sample.php'))
|
||||||
|
die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
|
||||||
|
|
||||||
|
if (!is_writable('../')) 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.");
|
||||||
|
|
||||||
$step = $HTTP_GET_VARS['step'];
|
$step = $HTTP_GET_VARS['step'];
|
||||||
if (!$step) $step = 0;
|
if (!$step) $step = 0;
|
||||||
@ -43,7 +50,6 @@ if (!$step) $step = 0;
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
switch($step) {
|
switch($step) {
|
||||||
|
|
||||||
case 0:
|
case 0:
|
||||||
?>
|
?>
|
||||||
<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
|
<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
|
||||||
@ -102,13 +108,15 @@ switch($step) {
|
|||||||
$dbhost = $HTTP_POST_VARS['dbhost'];
|
$dbhost = $HTTP_POST_VARS['dbhost'];
|
||||||
$prefix = $HTTP_POST_VARS['prefix'];
|
$prefix = $HTTP_POST_VARS['prefix'];
|
||||||
if (empty($prefix)) $prefix = 'wp_';
|
if (empty($prefix)) $prefix = 'wp_';
|
||||||
|
|
||||||
if (!file_exists('../wp-config-sample.php'))
|
// Test the db connection.
|
||||||
die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
|
define('DB_NAME', $dbname);
|
||||||
$configFile = file('../wp-config-sample.php');
|
define('DB_USER', $uname);
|
||||||
|
define('DB_PASSWORD', $passwrd);
|
||||||
if (!is_writable('../')) 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.");
|
define('DB_HOST', $dbhost);
|
||||||
$handle = fopen('../wp-config.php', 'w');
|
|
||||||
|
// We'll fail here if the values are no good.
|
||||||
|
require_once('../wp-includes/wp-db.php');
|
||||||
|
|
||||||
foreach ($configFile as $line_num => $line) {
|
foreach ($configFile as $line_num => $line) {
|
||||||
switch (substr($line,0,16)) {
|
switch (substr($line,0,16)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user