Changeset 4559 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api.php

Timestamp:

12/19/2016 07:00:06 AM (9 years ago)

Author:

dd32

Message:

Plugin Directory: Allow us to return the FAQ section with <h4> instead of <dl> for existing WordPress versions.
Also fixes the hot_tags endpoint to work correctly.

See #2112.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api.php

@@ -112 +112 @@
             if ( 'reviews' === $field && ! $include ) {
                 unset( $response['sections']['reviews'] );
+            }
+            if ( 'enhanced_faq' === $field ) {
+                if ( $include ) {
+                     $response['sections']['faq'] = $response['sections']['enhanced_faq'];
+                }
+                unset( $response['sections']['enhanced_faq'] );
             }
         }
@@ -180 +186 @@
      */
     public function popular_tags( $request ) {
-        if ( false === ( $response = false&& wp_cache_get( $cache_key = $this->popular_tags_cache_key( $request ), self::CACHE_GROUP ) ) ) {
-            $response = $this->internal_rest_api_call( 'plugins/v1/popular-categories', array( 'locale' => $request->locale ) );
+        if ( false === ( $response = wp_cache_get( $cache_key = $this->popular_tags_cache_key( $request ), self::CACHE_GROUP ) ) ) {
+            $response = $this->internal_rest_api_call( 'plugins/v1/popular-tags', array( 'locale' => $request->locale ) );
 
             if ( 200 != $response->status ) {
@@ -191 +197 @@
         }
 
-        if ( $request->number && count( $response ) > $request->number ) {
-            $response = array_slice( $response, 0, $request->number, true );
+        $number_items_requested = 100;
+        if ( !empty( $request->number ) ) {
+            $number_items_requested = $request->number;
+        }
+
+        if ( count( $response ) > $number_items_requested ) {
+            $response = array_slice( $response, 0, $number_items_requested, true );
         }
 
         $this->output( (object) $response );
     }
-    /**
-     * Generates a cache key for a 'hot_categories' API request.
+
+    /**
+     * Generates a cache key for a 'hot_tags' API request.
      */
     protected function popular_tags_cache_key( $request ) {
-        return 'hot_categories:' . $request->locale;
+        return 'hot_tags:' . $request->locale;;
     }