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

Timestamp:

01/31/2018 04:30:38 AM (9 years ago)

Author:

dd32

Message:

API: Theme Directory: In the info/1.2 API default to sending a more complete author response.

See #111.

File:

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

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

@@ -339 +339 @@
                 }
 
-                // 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;
-                }
-
                 // Set which fields wanted by default:
                 $defaults = array(
@@ -356 +350 @@
                         'template'     => true,
                 );
+                if ( defined( 'THEMES_API_VERSION' ) && THEMES_API_VERSION >= 1.2 ) {
+                        $defaults['extended_author'] = true;
+                }
 
                 if ( empty( $this->request->fields ) ) {
@@ -361 +358 @@
                 }
                 $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() . ':' . $this->request->slug . ':' . md5( serialize( $this->fields ) ) );
+                if ( false !== ( $this->response = wp_cache_get( $cache_key, $this->cache_group ) ) && empty( $this->request->cache_buster ) ) {
+                        return;
+                }
 
                 if ( !empty( $post ) && 'repopackage' == $post->post_type && $this->request->slug === $post->post_name ) {
@@ -440 +443 @@
                 );
 
-
                 $this->fields = array_merge( $this->fields, $defaults, (array) $this->request->fields );
 
@@ -596 +598 @@
                 if ( $this->fields['extended_author'] ) {
                         $phil->author = (object) array(
+                                '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,