WordPress.org

Make WordPress Core


Ignore:
Timestamp:
08/27/2016 10:31:11 PM (5 years ago)
Author:
wonderboymusic
Message:

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

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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/load.php

    r38404 r38411  
    395395    global $wpdb;
    396396
    397     require_once( ABSPATH . WPINC . '/wp-db.php' );
    398397    if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
    399398        require_once( WP_CONTENT_DIR . '/db.php' );
    400399
    401     if ( isset( $wpdb ) )
     400    if ( isset( $wpdb ) ) {
    402401        return;
     402    }
    403403
    404404    $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
Note: See TracChangeset for help on using the changeset viewer.