Merge with WordPress 2.3.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1139 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 1 insertions, 4 deletions

diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 976c5ac..139ccd3 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -1,9 +1,6 @@
 <?php
 die();
 define('WP_INSTALLING', true);
-//These two defines are required to allow us to use require_wp_db() to load the database class while being wp-content/wp-db.php aware
-define('ABSPATH', dirname(dirname(__FILE__)).'/');
-define('WPINC', 'wp-includes');
 
 require_once('../wp-includes/compat.php');
 require_once('../wp-includes/functions.php');
@@ -164,7 +161,7 @@ switch($step) {
 	define('DB_HOST', $dbhost);
 
 	// We'll fail here if the values are no good.
-	require_wp_db();
+	require_once('../wp-includes/wp-db.php');
 	$handle = fopen('../wp-config.php', 'w');
 
 	foreach ($configFile as $line_num => $line) {