Changeset 6197

Timestamp:

10/06/2007 08:12:06 AM (17 years ago)

Author:

westi

Message:

Remove accidental change to tags 2.3

Location:

tags/2.3

Files:

• wp-admin/setup-config.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

tags/2.3/wp-admin/setup-config.php

@@ -1 +1 @@
 <?php
 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(__FILE__).'/../');
-define('WPINC', 'wp-includes');
 
 require_once('../wp-includes/compat.php');
@@ -164 +161 @@
 
     // 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');
 

tags/2.3/wp-includes/functions.php

@@ -1417 +1417 @@
 }
 
-/*
- * require_wp_db() - require_once the correct database class file.
- *
- * This function is used to load the database class file either at runtime or by wp-admin/setup-config.php
- * We must globalise $wpdb to ensure that it is defined globally by the inline code in wp-db.php
- *
- * @global $wpdb
- */
-function require_wp_db()
-{
-    global $wpdb;
-    if ( file_exists(ABSPATH . 'wp-content/db.php') )
-        require_once (ABSPATH . 'wp-content/db.php');
-    else
-        require_once (ABSPATH . WPINC . '/wp-db.php');
-}
-
 ?>

tags/2.3/wp-settings.php

@@ -118 +118 @@
 require (ABSPATH . WPINC . '/functions.php');
 
-require_wp_db();
+if ( file_exists(ABSPATH . 'wp-content/db.php') )
+    require_once (ABSPATH . 'wp-content/db.php');
+else
+    require_once (ABSPATH . WPINC . '/wp-db.php');
+
 // $table_prefix is deprecated as of 2.1
 $wpdb->prefix = $table_prefix;