Ticket #27055: 27055.diff

src/wp-admin/admin-ajax.php

@@ -58 +58 @@
         'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
         'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
         'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
-        'save-user-color-scheme', 'update-widget',
+        'save-user-color-scheme', 'update-widget', 'query-themes',
 );
 
 // Register core Ajax calls.

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

@@ -2204 +2204 @@
         update_user_meta( get_current_user_id(), 'admin_color', $color_scheme );
         wp_send_json_success();
 }
+
+/**
+ * Proxy requests for themes
+ *
+ * @since 3.8.0
+ */
+function wp_ajax_query_themes(){
+
+
+        check_ajax_referer( 'query-themes', 'nonce' );
+
+        $base_url = 'http://api.wordpress.org/themes/info/1.1/?action=query_themes';
+
+        $return = wp_remote_post( $base_url, array(
+                'body' => array( 'request' => $_REQUEST['request'] )
+        ));
+
+        if ( is_wp_error( $return ) ) {
+                wp_send_json_error();
+        }
+
+        wp_send_json_success( json_decode( $return['body'] ) );
+
+}

src/wp-admin/js/theme.js

@@ -249 +249 @@
                         this.currentQuery.page = 1;
                 }
 
+
                 // Otherwise, send a new API call and add it to the cache.
                 if ( ! query && ! isPaginated ) {
                         query = this.apiCall( request ).done( function( data ) {
                                 // Update the collection with the queried data.
+                                data = data.data;
                                 self.reset( data.themes );
                                 count = data.info.results;
 
@@ -274 +276 @@
                         // If it's a paginated request we need to fetch more themes...
                         if ( isPaginated ) {
                                 return this.apiCall( request, isPaginated ).done( function( data ) {
+                                        data = data.data;
                                         // Add the new themes to the current collection
                                         // @todo update counter
                                         self.add( data.themes );
@@ -287 +290 @@
                                 });
                         }
 
-                        if ( query.themes.length === 0 ) {
+                        if ( query.data.themes.length === 0 ) {
                                 self.trigger( 'query:empty' );
                         } else {
                                 $( 'body' ).removeClass( 'no-results' );
@@ -295 +298 @@
 
                         // Only trigger an update event since we already have the themes
                         // on our cached object
-                        if ( _.isNumber( query.total ) ) {
-                                this.count = query.total;
+                        if ( _.isNumber( query.data.total ) ) {
+                                this.count = query.data.total;
                         }
 
-                        if ( ! query.total ) {
+                        if ( ! query.data.total ) {
                                 this.count = this.length;
                         }
 
-                        this.reset( query.themes );
+                        this.reset( query.data.themes );
                         this.trigger( 'update' );
                 }
         },
@@ -322 +325 @@
 
                 // Ajax request to .org API
                 return $.ajax({
-                        url: 'https://api.wordpress.org/themes/info/1.1/?action=query_themes',
+                        url: ajaxurl,
 
                         // We want JSON data
                         dataType: 'json',
                         type: 'POST',
-                        crossDomain: true,
 
                         // Request data
                         data: {
-                                action: 'query_themes',
+                                action: 'query-themes',
+                                nonce: $('#query-theme-nonce').val(),
                                 request: _.extend({
                                         per_page: 72,
                                         fields: {
@@ -1553 +1556 @@
         }
 };
 
+
 // Ready...
 $( document ).ready(function() {
         if ( themes.isInstall ) {

src/wp-admin/theme-install.php

@@ -148 +148 @@
                                 <a href="#"><?php _e( 'Edit' ); ?></a>
                         </div>
                 </div>
+                <?php wp_nonce_field( 'query-themes', 'query-theme-nonce' ); ?>  
         </div>
         <div class="theme-browser"></div>
         <div id="theme-installer" class="wp-full-overlay expanded"></div>