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

Timestamp:

08/31/2016 05:48:49 AM (9 years ago)

Author:

wonderboymusic

Message:

General: use get_bloginfo( 'version' ) instead of global $wp_version in several locations - excluding those locations which reload version.php mid-flight.

See #37699.

File:

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

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

@@ -27 +27 @@
  * @global string $wp_local_package
  * @global wpdb   $wpdb
- * @global string $wp_version
  *
  * @staticvar bool $first_pass
@@ -34 +33 @@
  */
 function list_core_update( $update ) {
-    global $wp_local_package, $wpdb, $wp_version;
+    global $wp_local_package, $wpdb;
     static $first_pass = true;
+
+    $wp_version = get_bloginfo( 'version' );
 
     if ( 'en_US' == $update->locale && 'en_US' == get_locale() )
@@ -150 +151 @@
  * @since 2.7.0
  *
- * @global string $wp_version
  * @global string $required_php_version
  * @global string $required_mysql_version
  */
 function core_upgrade_preamble() {
-    global $wp_version, $required_php_version, $required_mysql_version;
-
+    global $required_php_version, $required_mysql_version;
+
+    $wp_version = get_bloginfo( 'version' );
     $updates = get_core_updates();
 
@@ -212 +213 @@
 }
 
-/**
- *
- * @global string $wp_version
- */
 function list_plugin_updates() {
-    global $wp_version;
-
-    $cur_wp_version = preg_replace('/-.*$/', '', $wp_version);
+    $wp_version = get_bloginfo( 'version' );
+    $cur_wp_version = preg_replace( '/-.*$/', '', $wp_version );
 
     require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');