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

Timestamp:

03/15/2024 07:16:32 AM (21 months ago)

Author:

dd32

Message:

wporg-plugins-2024: Attempt to support retaining the filters for searches.

This has many rough edges, as the UI doesn't match the WordPress template heirachy that was never designed for combination views.

File:

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

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

@@ -1022 +1022 @@
                 break;
 
+            case 'ratings':
+                $wp_query->query_vars['orderby'] = 'num_ratings';
+                // Fall through.
             case 'num_ratings':
-            case 'ratings':
                 $wp_query->query_vars['meta_query']['num_ratings'] ??= [
                     'key'     => 'num_ratings',
@@ -1030 +1032 @@
                     'value'   => 0,
                 ];
-
-                $wp_query->query_vars['orderby']  = 'num_ratings';
                 break;
 
             case '_active_installs':
+                $wp_query->query_vars['orderby']  = 'active_installs';
+                // Fall through.
             case 'active_installs':
                 $wp_query->query_vars['meta_query']['active_installs'] ??= [
@@ -1041 +1043 @@
                     'compare' => 'EXISTS'
                 ];
-
-                $wp_query->query_vars['orderby']  = 'active_installs';
                 break;
 
@@ -1067 +1067 @@
                     'compare' => 'EXISTS',
                 ];
-                $wp_query->query_vars['orderby']  = 'downloads';
                 break;
         }
@@ -1468 +1467 @@
         // New-style search links.
         if ( get_query_var( 's' ) && isset( $_GET['s'] ) ) {
-            $url = site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' );
-            if ( get_query_var( 'block_search' ) ) {
-                $url = add_query_arg( 'block_search', get_query_var( 'block_search' ), $url );
+            $url        = site_url( '/search/' . urlencode( get_query_var( 's' ) ) . '/' );
+            $query_vars = array_filter( $wp_query->query );
+
+            // Don't need the search..
+            unset( $query_vars['s'] );
+
+            // Temporary: Disable sorts for search.
+            unset( $query_vars['order'], $query_vars['orderby'] );
+
+            if ( ! empty( $query_vars ) ) {
+                $url = add_query_arg( $query_vars, $url );
             }