Changeset 41605 for trunk/src/wp-admin/includes/import.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/import.php (modified) (1 diff)

trunk/src/wp-admin/includes/import.php

@@ -132 +132 @@
         if ( ! $popular_importers ) {
                 $url = add_query_arg( array(
-                        'locale'  => get_user_locale(),
+                        'locale'  => $locale,
                         'version' => $wp_version,
                 ), 'http://api.wordpress.org/core/importers/1.1/' );
-                $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
+                $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
+
+                if ( wp_http_supports( array( 'ssl' ) ) ) {
+                        $url = set_url_scheme( $url, 'https' );
+                }
+
                 $response = wp_remote_get( $url, $options );
                 $popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );