Changeset 4125

Timestamp:

09/24/2016 05:06:50 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Switch from Categories back to Tags.

See #1719

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• api/class-base.php (modified) (1 diff)
• api/routes/class-popular-tags.php (moved) (moved from sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-popular-categories.php) (2 diffs)
• readme/class-parser.php (modified) (1 diff)
• standalone/class-plugins-info-api-request.php (modified) (1 diff)
• standalone/class-plugins-info-api.php (modified) (3 diffs)
• widgets/class-meta.php (modified) (1 diff)

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

@@ -17 +17 @@
         new Routes\Plugin_Favorites();
         new Routes\Commit_Subscriptions();
-        new Routes\Popular_Categories();
+        new Routes\Popular_Tags();
         new Routes\Query_Plugins();
         new Routes\SVN_Access();

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-popular-tags.php

@@ -9 +9 @@
  * @package WordPressdotorg_Plugin_Directory
  */
-class Popular_Categories extends Base {
+class Popular_Tags extends Base {
 
     function __construct() {
-        register_rest_route( 'plugins/v1', '/popular-categories/?', array(
+        register_rest_route( 'plugins/v1', '/popular-tags/?', array(
             'methods'  => WP_REST_Server::READABLE,
-            'callback' => array( $this, 'popular_categories' ),
+            'callback' => array( $this, 'popular_tags' ),
         ) );
     }
@@ -24 +24 @@
      * @return array A formatted array of all plugin categories on the site.
      */
-    function popular_categories( $request ) {
-        $terms = get_terms( 'plugin_category', array( 'hide_empty' => false, 'orderby' => 'count', 'order' => 'DESC' ) );
+    function popular_tags( $request ) {
+        $terms = get_terms( 'plugin_tags', array( 'hide_empty' => false, 'orderby' => 'count', 'order' => 'DESC' ) );
 
         $response = array();

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-parser.php

@@ -205 +205 @@
             $this->tags = explode( ',', $headers['tags'] );
             $this->tags = array_map( 'trim', $this->tags );
+            $this->tags = array_filter( $this->tags );
+            $this->tags = array_slice( $this->tags, 0, 5 );
         }
         if ( ! empty( $headers['requires'] ) ) {

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

@@ -164 +164 @@
             // Tags
             if ( ! empty( $this->args->tag ) ) {
-                $query['plugin_category'] = is_array( $this->args->tag ) ? reset( $this->args->tag ) : $this->args->tag;
+                $query['plugin_tag'] = is_array( $this->args->tag ) ? reset( $this->args->tag ) : $this->args->tag;
             }
 

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

@@ -42 +42 @@
                 break;
 
-            case 'popular_categories':
+            case 'popular_tags':
             case 'hot_tags':
-                $this->popular_categories( $request );
+                $this->popular_tags( $request );
                 break;
 
@@ -177 +177 @@
 
     /**
-     * API Endpoint for the 'populat_categories' and 'hot_tags' API endpoints.
-     */
-    public function popular_categories( $request ) {
-        if ( false === ( $response = false&& wp_cache_get( $cache_key = $this->popular_categories_cache_key( $request ), self::CACHE_GROUP ) ) ) {
+     * API Endpoint for the 'popular_tags' and 'hot_tags' API endpoints.
+     */
+    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 ) );
 
@@ -200 +200 @@
      * Generates a cache key for a 'hot_categories' API request.
      */
-    protected function popular_categories_cache_key( $request ) {
+    protected function popular_tags_cache_key( $request ) {
         return 'hot_categories:' . $request->locale;
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php

@@ -57 +57 @@
             <li><?php printf( __( 'Active installs: %s', 'wporg-plugins' ), '<strong>' . Template::active_installs( false ) . '</strong>' ); ?></li>
             <li><?php printf( __( 'Tested up to: %s', 'wporg-plugins' ), '<strong>' . (string) get_post_meta( $post->ID, 'tested', true ) . '</strong>' ); ?></li>
-            <?php if ( $categories = get_the_term_list( $post->ID, 'plugin_category', '<div class="tags">', '', '</div>' ) ) : ?>
-                <li><?php printf( _n( 'Category: %s', 'Categories: %s', count( get_the_terms( $post, 'plugin_category' ) ), 'wporg-plugins' ), $categories ); ?></li>
+            <?php if ( $tags = get_the_term_list( $post->ID, 'plugin_tags', '<div class="tags">', '', '</div>' ) ) : ?>
+                <li><?php printf( _n( 'Tags: %s', 'Tags: %s', count( get_the_terms( $post, 'plugin_tags' ) ), 'wporg-plugins' ), $tags ); ?></li>
             <?php endif; ?>
         </ul>