Changeset 38411 for trunk/src/wp-admin/update-core.php

Timestamp:

08/27/2016 10:31:11 PM (8 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:

• trunk/src/wp-admin/update-core.php (modified) (4 diffs)

trunk/src/wp-admin/update-core.php

@@ -164 +164 @@
 
         if ( wp_http_supports( array( 'ssl' ) ) ) {
-            require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
             $upgrader = new WP_Automatic_Updater;
             $future_minor_update = (object) array(
@@ -188 +187 @@
 
     if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
-        require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
         $upgrader = new WP_Automatic_Updater;
         if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
@@ -439 +437 @@
     global $wp_filesystem;
 
-    include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-
     if ( $reinstall )
         $url = 'update-core.php?action=do-core-reinstall';
@@ -711 +707 @@
 
     require_once( ABSPATH . 'wp-admin/admin-header.php' );
-    include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
     $url = 'update-core.php?action=do-translation-upgrade';