vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 15:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bootstrap: after r38409 and r38410, revert r38402 which reverted r38399.

Browse Source 
This fixes the paths in `wp-vendor/` that were including `src`. I want to drop this in so we can find out what else will break.

See #36335.


git-svn-id: https://develop.svn.wordpress.org/trunk@38411 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2016-08-27 22:31:11 +00:00
parent 06b6097bca
commit 4225e71a6b
47 changed files with 39 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/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 );
}