IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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

Built from https://develop.svn.wordpress.org/trunk@38402


git-svn-id: http://core.svn.wordpress.org/trunk@38343 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse
2016-08-27 14:37:32 +00:00
parent 8b5fc84e63
commit 0e31a46161
46 changed files with 381 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/load.php
View File

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