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

Timestamp:

01/10/2015 05:56:45 AM (11 years ago)

Author:

wonderboymusic

Message:

Declare $wp_version, $required_php_version, and $required_mysql_version as globals in install and upgrade admin files.

See #30799.

File:

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

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

@@ -813 +813 @@
     // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
     // $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 ) ) {
@@ -825 +827 @@
     $php_version    = phpversion();
     $mysql_version  = $wpdb->db_version();
-    $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from
+    $old_wp_version = $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, '>=' );