diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-01-02 16:00:05 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-01-02 16:00:05 +0000 |
| commit | 1503e05616c295e6f980134dc341fa1a66dc9672 (patch) | |
| tree | b0a7dc356affec0059670603f1cb990da7dbc026 /wp-admin/setup-config.php | |
| parent | c65d51fec1d641efd1ec8a44c046cd54d588fe3b (diff) | |
Merge with WP 2.3.2
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1172 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/setup-config.php')
| -rw-r--r-- | wp-admin/setup-config.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 139ccd3..99af3b4 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -4,6 +4,7 @@ define('WP_INSTALLING', true); require_once('../wp-includes/compat.php'); require_once('../wp-includes/functions.php'); +require_once('../wp-includes/classes.php'); if (!file_exists('../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.'); @@ -162,6 +163,9 @@ switch($step) { // We'll fail here if the values are no good. require_once('../wp-includes/wp-db.php'); + if ( !empty($wpdb->error) ) + wp_die($wpdb->error->get_error_message()); + $handle = fopen('../wp-config.php', 'w'); foreach ($configFile as $line_num => $line) { |