Changeset 41605 for trunk/src/wp-admin/includes/class-wp-community-events.php

Timestamp:

09/27/2017 07:59:14 AM (9 years ago)

Author:

dd32

Message:

Standardise on performing api.WordPress.org requests over SSL when possible, falling back to non-SSL when appropriate.
This also standardises the User-Agent used when communicating with WordPress.org, allowing for more consistent version detection.

Fixes #42004.

File:

• trunk/src/wp-admin/includes/class-wp-community-events.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-community-events.php

@@ -93 +93 @@
         }
 
-        $api_url        = 'https://api.wordpress.org/events/1.0/';
-        $request_args   = $this->get_request_args( $location_search, $timezone );
+        // include an unmodified $wp_version
+        include( ABSPATH . WPINC . '/version.php' );
+
+        $api_url      = 'http://api.wordpress.org/events/1.0/';
+        $request_args = $this->get_request_args( $location_search, $timezone );
+        $request_args['user-agent'] = 'WordPress/' . $wp_version . '; ' . home_url( '/' );
+
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $api_url = set_url_scheme( $api_url, 'https' );
+        }
+
         $response       = wp_remote_get( $api_url, $request_args );
         $response_code  = wp_remote_retrieve_response_code( $response );