Changeset 39687

Timestamp:

01/05/2017 06:12:03 AM (8 years ago)

Author:

dd32

Message:

Upgrade: Fix the installation of TwentySeventeen upon upgrade from an early version.

This reverts part of [31124] which incorrectly caused $old_wp_version to equal the version of WordPress being upgraded to due to global variable access changes.

See #38551, #30799.
Fixes #39138 for trunk.

File:

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

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

@@ -836 +836 @@
 
 
-    /**
-     * Import $wp_version, $required_php_version, and $required_mysql_version from the new version
-     * $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
+    /*
+     * Import $wp_version, $required_php_version, and $required_mysql_version from the new version.
+     * DO NOT globalise any variables imported from `version-current.php` in this function. 
      *
-     * @global string $wp_version
-     * @global string $required_php_version
-     * @global string $required_mysql_version
+     * BC Note: $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
      */
-    global $wp_version, $required_php_version, $required_mysql_version;
-
     $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
     if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
@@ -858 +854 @@
     $php_version    = phpversion();
     $mysql_version  = $wpdb->db_version();
-    $old_wp_version = $wp_version; // The version of WordPress we're updating from
+    $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from
     $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' )  ); // a dash in the version indicates a Development release
     $php_compat     = version_compare( $php_version, $required_php_version, '>=' );