Changeset 38459 for trunk/src/wp-includes/class-http.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-includes/class-http.php (modified) (4 diffs)

trunk/src/wp-includes/class-http.php

@@ -102 +102 @@
      * @since 2.7.0
      *
-     * @global string $wp_version
-     *
      * @param string       $url  The request URL.
      * @param string|array $args {
@@ -117 +115 @@
      *                                             Default '1.0'.
      *     @type string       $user-agent          User-agent value sent.
-     *                                             Default WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ).
+     *                                             Default WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ).
      *     @type bool         $reject_unsafe_urls  Whether to pass URLs through wp_http_validate_url().
      *                                             Default false.
@@ -149 +147 @@
      */
     public function request( $url, $args = array() ) {
-        global $wp_version;
-
         $defaults = array(
             'method' => 'GET',
@@ -186 +182 @@
              * @param string $user_agent WordPress user agent string.
              */
-            'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ),
+            'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) ),
             /**
              * Filters whether to pass URLs through wp_http_validate_url() in an HTTP request.