Changeset 38459 for trunk/src/wp-admin/includes/class-wp-automatic-updater.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/includes/class-wp-automatic-updater.php (modified) (5 diffs)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -372 +372 @@
      * @since 3.7.0
      * @access public
-     *
-     * @global wpdb   $wpdb
-     * @global string $wp_version
      */
     public function run() {
-        global $wpdb, $wp_version;
-
         if ( $this->is_disabled() )
             return;
@@ -458 +453 @@
         // Send debugging email to all development installs.
         if ( ! empty( $this->update_results ) ) {
-            $development_version = false !== strpos( $wp_version, '-' );
+            $development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
 
             /**
@@ -495 +490 @@
      * @access protected
      *
-     * @global string $wp_version
-     *
      * @param object $update_result The result of the core update. Includes the update offer and result.
      */
     protected function after_core_update( $update_result ) {
-        global $wp_version;
+        $wp_version = get_bloginfo( 'version' );
 
         $core_update = $update_result->item;
@@ -585 +578 @@
      * @access protected
      *
-     * @global string $wp_version
-     *
      * @param string $type        The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'.
      * @param object $core_update The update offer that was attempted.
@@ -723 +714 @@
         if ( 'critical' == $type && is_wp_error( $result ) ) {
             $body .= "\n***\n\n";
-            $body .= sprintf( __( 'Your site was running version %s.' ), $GLOBALS['wp_version'] );
+            $body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
             $body .= ' ' . __( 'We have some data that describes the error your site encountered.' );
             $body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );