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

Timestamp:

06/20/2016 01:04:32 PM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Allow for the custom query logic to be applied to all WP_Query instances, not just the main query.
Also removes a weird SQL hack to remove the browse query var from queries, and replaces it with an equally weird closure hack.

See #1584

File:

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

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

@@ -416 +416 @@
      */
     public function use_plugins_in_query( $wp_query ) {
-        if ( is_admin() || ! $wp_query->is_main_query() ) {
+        if ( is_admin() ) {
             return;
         }
@@ -429 +429 @@
         }
 
-        switch ( get_query_var( 'browse' ) ) {
+        switch ( $wp_query->query_vars['browse'] ) {
             case 'favorites':
                 $favorites_user = wp_get_current_user();
@@ -451 +451 @@
                 }
 
-                add_filter( 'posts_where', array( $this, 'pre_get_posts_sql_browse' ) );
                 break;
 
             case 'new':
-            case 'popular':
-                add_filter( 'posts_where', array( $this, 'pre_get_posts_sql_browse' ) );
+                $wp_query->query_vars['orderby']  = 'post_modified';
                 break;
         }
 
-        if ( $wp_query->is_archive() && ! $wp_query->is_tax( 'plugin_section', 'new' ) && empty( $wp_query->query_vars['orderby'] ) ) {
+        if ( isset( $wp_query->query['browse'] ) ) {
+            if ( 'beta' != $wp_query->query['browse'] && 'featured' != $wp_query->query['browse'] ) {
+                unset( $wp_query->query_vars['browse'] );
+
+                add_filter( 'the_posts', function( $posts, $wp_query ) {
+                    // Fix the queried object for the archive view
+                    if ( ! $wp_query->queried_object && isset( $wp_query->query['browse'] ) ) {
+                        $wp_query->query_vars['browse'] = $wp_query->query['browse'];
+                        $wp_query->queried_object = get_term_by( 'slug', $wp_query->query['browse'], 'plugin_section' );
+                    }
+                    return $posts;
+                }, 10, 2 );
+
+            }
+        }
+
+        if ( empty( $wp_query->query_vars['orderby'] ) ) {
             $wp_query->query_vars['orderby']  = 'meta_value_num';
             $wp_query->query_vars['meta_key'] = '_active_installs';
         }
-    }
-
-    /**
-     * Callback to remove the requirement for plugins to be tagged with the requested
-     * plugin_section term.
-     *
-     * Used for archives like `popular` or `favorites`, that all active plugins are a part of.
-     *
-     * @ignore
-     *
-     * @param string $where WHERE clause.
-     * @return string
-     */
-    public function pre_get_posts_sql_browse( $where ) {
-        global $wpdb;
-
-        remove_filter( 'posts_where', array( $this, 'pre_get_posts_sql_browse' ) );
-
-        $term = get_term_by( 'slug', get_query_var( 'browse' ), 'plugin_section' );
-
-        if ( $term instanceof \WP_Term ) {
-            $where = str_replace( " AND ( \n  {$wpdb->term_relationships}.term_taxonomy_id IN ({$term->term_id})\n)", '', $where );
-        }
-
-        return $where;
     }