Changeset 42632

Timestamp:

02/01/2018 05:18:54 AM (7 years ago)

Author:

dd32

Message:

Themes: Use api.wordpress.org/themes/info/1.2/ to query theme information.

See #43192.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/theme.php (modified) (7 diffs)
• wp-admin/js/theme.js (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (3 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3219 +3219 @@
 
         $theme->name        = wp_kses( $theme->name, $themes_allowedtags );
-        $theme->author      = wp_kses( $theme->author, $themes_allowedtags );
+        $theme->author      = wp_kses( $theme->author['display_name'], $themes_allowedtags );
         $theme->version     = wp_kses( $theme->version, $themes_allowedtags );
         $theme->description = wp_kses( $theme->description, $themes_allowedtags );

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

@@ -422 +422 @@
  */
 function themes_api( $action, $args = array() ) {
+    // include an unmodified $wp_version
+    include( ABSPATH . WPINC . '/version.php' );
 
     if ( is_array( $args ) ) {
@@ -427 +429 @@
     }
 
-    if ( ! isset( $args->per_page ) ) {
-        $args->per_page = 24;
+    if ( 'query_themes' == $action ) {
+        if ( ! isset( $args->per_page ) ) {
+            $args->per_page = 24;
+        }
     }
 
     if ( ! isset( $args->locale ) ) {
         $args->locale = get_user_locale();
+    }
+
+    if ( ! isset( $args->wp_version ) ) {
+        $args->wp_version = substr( $wp_version, 0, 3 ); // X.y
     }
 
@@ -466 +474 @@
 
     if ( ! $res ) {
-        // include an unmodified $wp_version
-        include( ABSPATH . WPINC . '/version.php' );
-
-        $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
+        $url = 'http://api.wordpress.org/themes/info/1.2/';
+        $url = add_query_arg(
+            array(
+                'action'  => $action,
+                'request' => $args,
+            ),
+            $url
+        );
+
+        $http_url = $url;
         if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
             $url = set_url_scheme( $url, 'https' );
@@ -476 +490 @@
         $http_args = array(
             'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
-            'body'       => array(
-                'action'  => $action,
-                'request' => serialize( $args ),
-            ),
         );
-        $request   = wp_remote_post( $url, $http_args );
+        $request   = wp_remote_get( $url, $http_args );
 
         if ( $ssl && is_wp_error( $request ) ) {
@@ -494 +504 @@
                 );
             }
-            $request = wp_remote_post( $http_url, $http_args );
+            $request = wp_remote_get( $http_url, $http_args );
         }
 
@@ -508 +518 @@
             );
         } else {
-            $res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-            if ( ! is_object( $res ) && ! is_array( $res ) ) {
+            $res = json_decode( wp_remote_retrieve_body( $request ), true );
+            if ( is_array( $res ) ) {
+                // Object casting is required in order to match the info/1.0 format.
+                $res = (object) $res;
+            } elseif ( null === $res ) {
                 $res = new WP_Error(
                     'themes_api_failed',
@@ -520 +533 @@
                 );
             }
+
+            if ( isset( $res->error ) ) {
+                $res = new WP_Error( 'themes_api_failed', $res->error );
+            }
+        }
+
+        // Back-compat for info/1.2 API, upgrade the theme objects in query_themes to objects.
+        if ( 'query_themes' == $action ) {
+            foreach ( $res->themes as $i => $theme ) {
+                $res->themes[ $i ] = (object) $theme;
+            }
+        }
+        // Back-compat for info/1.2 API, downgrade the feature_list result back to an array.
+        if ( 'feature_list' == $action ) {
+            $res = (array) $res;
         }
     }

trunk/src/wp-admin/js/theme.js

@@ -335 +335 @@
             // Request data
                 request: _.extend({
-                    per_page: 100,
-                    fields: {
-                        description: true,
-                        tested: true,
-                        requires: true,
-                        rating: true,
-                        downloaded: true,
-                        downloadLink: true,
-                        last_updated: true,
-                        homepage: true,
-                        num_ratings: true
-                    }
+                    per_page: 100
                 }, request)
             },

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -5620 +5620 @@
             $wporg_args = array(
                 'per_page' => 100,
-                'fields'   => array(
-                    'screenshot_url' => true,
-                    'description'    => true,
-                    'rating'         => true,
-                    'downloaded'     => true,
-                    'downloadlink'   => true,
-                    'last_updated'   => true,
-                    'homepage'       => true,
-                    'num_ratings'    => true,
-                    'tags'           => true,
-                    'parent'         => true,
-                    // 'extended_author' => true, @todo: WordPress.org throws a 500 server error when this is here.
-                ),
             );
 
@@ -5675 +5662 @@
 
                 $theme->name        = wp_kses( $theme->name, $themes_allowedtags );
-                $theme->author      = wp_kses( $theme->author, $themes_allowedtags );
                 $theme->version     = wp_kses( $theme->version, $themes_allowedtags );
                 $theme->description = wp_kses( $theme->description, $themes_allowedtags );
-                $theme->tags        = implode( ', ', $theme->tags );
                 $theme->stars       = wp_star_rating(
                     array(
@@ -5703 +5688 @@
                 $theme->id           = $theme->slug;
                 $theme->screenshot   = array( $theme->screenshot_url );
-                $theme->authorAndUri = $theme->author;
-                // The .org API can return the full parent theme details if passed the 'parent' arg, or if passed the 'template' option it'll return that in the event it's a child theme.
+                $theme->authorAndUri = wp_kses( $theme->author['display_name'], $themes_allowedtags );
+
                 if ( isset( $theme->parent ) ) {
                     $theme->parent = $theme->parent['slug'];