Changeset 38402 for trunk/src/wp-includes/load.php

Timestamp:

08/27/2016 02:36:42 PM (8 years ago)

Author:

dd32

Message:

Bootstrap: Revert [38399] as it's broken /build/ and subsequently core.svn.wordpress.org.

The generated classmaps reference /src/ files and operates in the assumption that the base directory is one level above wp-settings.php, which it isn't after our build processes are run.

See #36335

File:

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

trunk/src/wp-includes/load.php

@@ -395 +395 @@
     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 ) ) {
+    if ( isset( $wpdb ) )
         return;
-    }
 
     $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );