Changeset 6198

Timestamp:

10/06/2007 08:18:33 AM (18 years ago)

Author:

westi

Message:

Move database class loading to a shared function to ensure all of WordPress is wp-content/wp-db.php aware. Fixes #5128 props ComputerGuru.

Location:

trunk

Files:

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

trunk/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(dirname(__FILE__)).'/');
+define('WPINC', 'wp-includes');
 
 require_once('../wp-includes/compat.php');
@@ -161 +164 @@
 
     // We'll fail here if the values are no good.
-    require_once('../wp-includes/wp-db.php');
+    require_wp_db();
     $handle = fopen('../wp-config.php', 'w');
 

trunk/wp-includes/functions.php

@@ -1416 +1416 @@
 }
 
+/*
+ * 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');
+}
+
 ?>

trunk/wp-settings.php

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