Changeset 6497 for sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php

Timestamp:

02/01/2018 04:27:56 AM (7 years ago)

Author:

dd32

Message:

Theme Directory: API: Update the list of fields to include by default in teh info/1.2 API endpoints.

See #111.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php

@@ -357 +357 @@
         if ( defined( 'THEMES_API_VERSION' ) && THEMES_API_VERSION >= 1.2 ) {
             $defaults['extended_author'] = true;
+            $defaults['num_ratings'] = true;
+            $detaults['parent'] = true;
         }
 
@@ -411 +413 @@
     public function query_themes() {
         global $wp_query;
-        // If there is a cached result, return that.
-        $cache_key = sanitize_key( __METHOD__ . ':' . get_locale() . ':' . md5( serialize( $this->request ) ) );
-        if ( false !== ( $this->response = wp_cache_get( $cache_key, $this->cache_group ) ) && empty( $this->request->cache_buster ) ) {
-            return;
-        }
-
-        if ( isset( $wp_query ) && $wp_query->query_vars ) {
-            $this->result = $wp_query;
-        } else {
-            $this->result = $this->perform_wp_query();
-        }
-
-        if ( empty( $this->request->fields ) ) {
-            $this->request->fields = array();
-        }
-
-        // Basic information about the request.
-        $this->response = (object) array(
-            'info'   => array(),
-            'themes' => array(),
-        );
-
-        // Basic information about the request.
-        $this->response->info = array(
-            'page'    => max( 1, $this->result->query_vars['paged'] ),
-            'pages'   => max( 1, $this->result->max_num_pages ),
-            'results' => (int) $this->result->found_posts,
-        );
 
         // Set which fields wanted by default:
@@ -447 +421 @@
             'template'    => true,
         );
+        if ( defined( 'THEMES_API_VERSION' ) && THEMES_API_VERSION >= 1.2 ) {
+            $defaults['extended_author'] = true;
+            $defaults['num_ratings'] = true;
+            $detaults['parent'] = true;
+        }
 
         $this->fields = array_merge( $this->fields, $defaults, (array) $this->request->fields );
+
+        // If there is a cached result, return that.
+        $cache_key = sanitize_key( __METHOD__ . ':' . get_locale() . ':' . md5( serialize( $this->request ) . serialize( $this->fields ) ) );
+        if ( false !== ( $this->response = wp_cache_get( $cache_key, $this->cache_group ) ) && empty( $this->request->cache_buster ) ) {
+            return;
+        }
+
+        if ( isset( $wp_query ) && $wp_query->query_vars ) {
+            $this->result = $wp_query;
+        } else {
+            $this->result = $this->perform_wp_query();
+        }
+
+        if ( empty( $this->request->fields ) ) {
+            $this->request->fields = array();
+        }
+
+        // Basic information about the request.
+        $this->response = (object) array(
+            'info'   => array(),
+            'themes' => array(),
+        );
+
+        // Basic information about the request.
+        $this->response->info = array(
+            'page'    => max( 1, $this->result->query_vars['paged'] ),
+            'pages'   => max( 1, $this->result->max_num_pages ),
+            'results' => (int) $this->result->found_posts,
+        );
 
         // Fill up the themes lists.
@@ -605 +613 @@
                 'profile' => 'https://profiles.wordpress.org/' . $author->user_nicename,
                 'avatar' => 'https://secure.gravatar.com/avatar/' . md5( $author->user_email ) . '?s=96&d=monsterid&r=g',
-                'user_nicename' => $author->user_nicename,
                 'display_name'  => $author->display_name,
             );