Changeset 15638

Timestamp:

09/20/2010 07:13:47 PM (13 years ago)

Author:

nacin

Message:

Always include wp-db.php. Prevents a conditional include and allows db dropins to cleanly extend the wpdb class. Move require_wp_db() to load.php for consistency with bootloader helpers. fixes #14508.

Location:

trunk

Files:

• wp-includes/functions.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -3102 +3102 @@
 
 /**
- * Load 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.
- *
- * @since 2.5.0
- * @global $wpdb WordPress Database Object
- */
-function require_wp_db() {
-    global $wpdb;
-    if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-        require_once( WP_CONTENT_DIR . '/db.php' );
-    else
-        require_once( ABSPATH . WPINC . '/wp-db.php' );
-}
-
-/**
  * Load custom DB error or display WordPress DB error.
  *

trunk/wp-includes/load.php

@@ -306 +306 @@
         }
     }
+}
+
+/**
+ * Load 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 globalize $wpdb to ensure that it is
+ * defined globally by the inline code in wp-db.php.
+ *
+ * @since 2.5.0
+ * @global $wpdb WordPress Database Object
+ */
+function require_wp_db() {
+    global $wpdb;
+
+    require_once( ABSPATH . WPINC . '/wp-db.php' );
+    if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
+        require_once( WP_CONTENT_DIR . '/db.php' );
+
+    if ( isset( $wpdb ) )
+        return;
+
+    $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
 }
 

trunk/wp-includes/wp-db.php

@@ -1555 +1555 @@
 }
 
-if ( ! isset( $wpdb ) ) {
-    /**
-     * WordPress Database Object, if it isn't set already in wp-content/db.php
-     * @global object $wpdb Creates a new wpdb object based on wp-config.php Constants for the database
-     * @since 0.71
-     */
-    $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
-}
 ?>

trunk/wp-settings.php

@@ -68 +68 @@
 require( ABSPATH . WPINC . '/classes.php' );
 
-// Include the wpdb class, or a db.php database drop-in if present.
+// Include the wpdb class and, if present, a db.php database drop-in.
 require_wp_db();