Changeset 38459 for trunk/src/wp-admin/includes/class-wp-press-this.php

Timestamp:

08/31/2016 05:48:49 AM (8 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-press-this.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -268 +268 @@
      */
     public function fetch_source_html( $url ) {
-        global $wp_version;
-
         if ( empty( $url ) ) {
             return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
@@ -277 +275 @@
             'timeout' => 30,
             // Use an explicit user-agent for Press This
-            'user-agent' => 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' )
+            'user-agent' => 'Press This (WordPress/' . get_bloginfo( 'version' ) . '); ' . get_bloginfo( 'url' )
         ) );
 
@@ -1190 +1188 @@
      *
      * @global WP_Locale $wp_locale
-     * @global string    $wp_version
      * @global bool      $is_IE
      */
     public function html() {
-        global $wp_locale, $wp_version;
+        global $wp_locale;
+
+        $wp_version = get_bloginfo( 'version' );
 
         // Get data, new (POST) and old (GET).