Changeset 11295

Timestamp:

10/23/2021 02:27:10 AM (3 years ago)

Author:

ryelle

Message:

Plugin Directory: Only unset the search query when bypassing the general search.

In [11292], the search term was always unset, causing general plugin search to break. Instead, the search term should only be unset when alternate queries are set up (slug matches or block search).

Fixes #5910.

File:

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

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

@@ -99 +99 @@
             if ( 'slug:' === substr( $query['s'], 0, 5 ) ) {
                 $query['name'] = substr( $query['s'], 5 );
-            }
-
-            if ( 'block:' === substr( $query['s'], 0, 6 ) ) {
+                unset( $query['s'], $query['block_search'] );
+            } elseif ( 'block:' === substr( $query['s'], 0, 6 ) ) {
                 $query['meta_query'][] = [
                     'key' => 'block_name',
@@ -115 +114 @@
                 // Prioritise block plugins, but try again without the restriction.
                 $try_again_without_tax_query = true;
+                unset( $query['s'], $query['block_search'] );
             }
-
-            unset( $query['s'], $query['block_search'] );
         }