Changeset 15638 for trunk/wp-includes/load.php

Timestamp:

09/20/2010 07:13:47 PM (14 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.

File:

• trunk/wp-includes/load.php (modified) (1 diff)

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 );
 }