Changeset 3338

Timestamp:

06/12/2016 10:15:16 AM (8 years ago)

Author:

obenland

Message:

Plugin Directory: Treat plugin sections like the archive they are.

Adds a special case for the term 'popular' to not require the term to be
assigned to a plugin for the plugin to show up in the term archive.

Fixes #1757.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/plugin-directory/class-plugin-directory.php (modified) (5 diffs)
• themes/pub/wporg-plugins/front-page.php (modified) (2 diffs)

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

@@ -99 +99 @@
         register_taxonomy( 'plugin_section', 'plugin', array(
             'hierarchical'      => true,
-            'query_var'         => 'plugin_section',
+            'query_var'         => 'browse',
             'rewrite'           => false,
             'public'            => true,
@@ -109 +109 @@
             ),
             'labels'            => array(
-                'name' => __( 'Plugin Sections', 'wporg-plugins' ),
+                'name' => __( 'Browse', 'wporg-plugins' ),
             ),
         ) );
@@ -409 +409 @@
 
         switch ( get_query_var( 'browse' ) ) {
-            case 'beta':
-                $wp_query->query_vars['plugin_section'] = 'beta';
-                break;
-
-            case 'featured':
-                $wp_query->query_vars['plugin_section'] = 'featured';
-                break;
-
             case 'favorites':
                 $favorites_user = get_current_user_id();
@@ -442 +434 @@
                 $wp_query->query_vars['orderby'] = 'meta_value_num';
                 $wp_query->query_vars['meta_key'] = 'active_installs';
+
+                add_filter( 'posts_where', array( $this, 'pre_get_posts_sql_browse_popular' ) );
                 break;
         }
-
+    }
+
+    /**
+     * Custom callback for pre_get_posts to remove the requirement for plugins to be tagged
+     * 'popular' to show up when browsing popular plugins.
+     *
+     * @ignore
+     *
+     * @param string $where WHERE clause.
+     * @return string
+     */
+    public function pre_get_posts_sql_browse_popular( $where ) {
+        global $wpdb;
+
+        remove_filter( 'posts_where', array( $this, 'pre_get_posts_sql_browse_popular' ) );
+        $term = get_term_by( 'slug', 'popular', 'plugin_section' );
+
+        return str_replace( " AND ( \n  {$wpdb->term_relationships}.term_taxonomy_id IN ({$term->term_id})\n)", '', $where );
     }
 
@@ -613 +624 @@
     /**
      * Filters the value of tax_inputs before saving.
-     * 
+     *
      * Used both in the admin and the uploader.
      *

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/front-page.php

@@ -26 +26 @@
     <main id="main" class="site-main" role="main">
 
-        <?php foreach ( $sections as $section_slug => $section_title ) :
+        <?php foreach ( $sections as $browse => $section_title ) :
             $section_args = array(
-                'post_type'       => 'plugin',
-                'posts_per_page'  => 4,
-                'plugin_section' => $section_slug,
+                'post_type'      => 'plugin',
+                'posts_per_page' => 4,
+                'browse'         => $browse,
             );
 
-            if ( 'popular' === $section_slug ) :
+            if ( 'popular' === $browse ) :
                 $section_args['meta_key'] = 'active_installs';
                 $section_args['orderby']  = 'meta_value_num';
-                unset( $section_args['plugin_section'] );
+                unset( $section_args['browse'] );
             endif;
 
             $section_query = new \WP_Query( $section_args );
-        ?>
+            ?>
 
             <section class="plugin-section">
                 <header class="section-header">
                     <h1 class="section-title"><?php echo esc_html( $section_title ); ?></h1>
-                    <a class="section-link" href="<?php echo esc_url( home_url( "browse/$section_slug/" ) ); ?>"><?php _ex( 'See all', 'plugins', 'wporg-plugins' ); ?></a>
+                    <a class="section-link" href="<?php echo esc_url( home_url( "browse/$browse/" ) ); ?>"><?php _ex( 'See all', 'plugins', 'wporg-plugins' ); ?></a>
                 </header>
 
                 <?php
-                    while ( $section_query->have_posts() ) :
-                        $section_query->the_post();
+                while ( $section_query->have_posts() ) :
+                    $section_query->the_post();
 
-                        get_template_part( 'template-parts/plugin', 'index' );
-                    endwhile;
+                    get_template_part( 'template-parts/plugin', 'index' );
+                endwhile;
                 ?>
             </section>
@@ -63 +63 @@
     <aside id="secondary" class="widget-area" role="complementary">
         <?php
-            the_widget( 'WP_Widget_Text', array(
-                'title' => 'Plugin Authors',
-                'text'  => 'Now what are the possibilities of warp drive? Cmdr Riker\'s nervous system has been invaded by an unknown microorganism. The organisms fuse to the nerve, intertwining at the molecular level. That\'s why the transporter\'s biofilters couldn\'t extract it.',
-            ), $widget_args );
+        the_widget( 'WP_Widget_Text', array(
+            'title' => 'Plugin Authors',
+            'text'  => 'Now what are the possibilities of warp drive? Cmdr Riker\'s nervous system has been invaded by an unknown microorganism. The organisms fuse to the nerve, intertwining at the molecular level. That\'s why the transporter\'s biofilters couldn\'t extract it.',
+        ), $widget_args );
 
-            the_widget( 'WP_Widget_Text', array(
-                'title' => 'Plugin Reviewers',
-                'text'  => 'Shields up. I recommend we transfer power to phasers and arm the photon torpedoes. Something strange on the detector circuit. The weapons must have disrupted our communicators.',
-            ), $widget_args );
+        the_widget( 'WP_Widget_Text', array(
+            'title' => 'Plugin Reviewers',
+            'text'  => 'Shields up. I recommend we transfer power to phasers and arm the photon torpedoes. Something strange on the detector circuit. The weapons must have disrupted our communicators.',
+        ), $widget_args );
 
-            the_widget( 'WP_Widget_Text', array(
-                'title' => 'Plugin Handbook',
-                'text'  => 'Communication is not possible. The shuttle has no power. Using the gravitational pull of a star to slingshot back in time? We are going to Starbase Montgomery for Engineering consultations prompted by minor read-out anomalies.',
-            ), $widget_args );
+        the_widget( 'WP_Widget_Text', array(
+            'title' => 'Plugin Handbook',
+            'text'  => 'Communication is not possible. The shuttle has no power. Using the gravitational pull of a star to slingshot back in time? We are going to Starbase Montgomery for Engineering consultations prompted by minor read-out anomalies.',
+        ), $widget_args );
         ?>
     </aside><!-- #secondary -->
-<?php
+    <?php
 get_footer();