Changeset 25441

Timestamp:

09/14/2013 07:30:44 PM (12 years ago)

Author:

nacin

Message:

Move to JSON for three api.wordpress.org endpoints. see #25311.

Location:

trunk/src/wp-admin

Files:

• credits.php (modified) (1 diff)
• includes/dashboard.php (modified) (2 diffs)
• includes/import.php (modified) (1 diff)

trunk/src/wp-admin/credits.php

@@ -21 +21 @@
         || ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
     ) {
-        $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.0/?version=$wp_version&locale=$locale" );
+        $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
 
         if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
             return false;
 
-        $results = maybe_unserialize( wp_remote_retrieve_body( $response ) );
+        $results = json_decode( wp_remote_retrieve_body( $response ), true );
 
         if ( ! is_array( $results ) )

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

@@ -1227 +1227 @@
         );
 
-        $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.0/', $options );
+        $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
 
         if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
@@ -1243 +1243 @@
          *  'img_src_ssl' - string - An image (over SSL) representing the browser
          */
-        $response = maybe_unserialize( wp_remote_retrieve_body( $response ) );
+        $response = json_decode( wp_remote_retrieve_body( $response ), true );
 
         if ( ! is_array( $response ) )

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

@@ -109 +109 @@
 
     if ( ! $popular_importers ) {
-        $url = add_query_arg( 'locale', get_locale(), 'http://api.wordpress.org/core/importers/1.0/' );
+        $url = add_query_arg( 'locale', get_locale(), 'http://api.wordpress.org/core/importers/1.1/' );
         $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
         $response = wp_remote_get( $url, $options );
-        $popular_importers = maybe_unserialize( wp_remote_retrieve_body( $response ) );
+        $popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
 
         if ( is_array( $popular_importers ) )