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

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -414 +414 @@
      *
      * @since 2.6.0
-     *
-     * @global string $wp_version
      */
     public function initialise_blog_option_info() {
-        global $wp_version;
-
         $this->blog_options = array(
             // Read only options
@@ -430 +426 @@
                 'desc'          => __( 'Software Version' ),
                 'readonly'      => true,
-                'value'         => $wp_version
+                'value'         => get_bloginfo( 'version' )
             ),
             'blog_url'          => array(
@@ -6187 +6183 @@
      * @since 1.5.0
      *
-     * @global string $wp_version
-     *
      * @param array  $args {
      *     Method arguments. Note: arguments must be ordered as documented.
@@ -6198 +6192 @@
      */
     public function pingback_ping( $args ) {
-        global $wp_version;
-
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
         do_action( 'xmlrpc_call', 'pingback.ping' );
@@ -6286 +6278 @@
 
         /** This filter is documented in wp-includes/class-http.php */
-        $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' ) );
 
         // Let's check the remote site