Changeset 13648

Timestamp:

05/02/2024 06:08:26 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Search: Properly limit block searches to the Block directory.

Likely broke via [13332].

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-search.php (modified) (1 diff)

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

@@ -217 +217 @@
                 // These are the things that jetpack_search_es_wp_query_args doesn't let us change, so we need to filter the es_query_args late in the code path to add more custom stuff.
 
-                $es_query_args['filter']['and'] ??= [];
-
-                // Exclude disabled plugins.
-                $es_query_args['filter']['and'][] = [
-                        'term' => [
-                                'disabled' => [
-                                        'value' => false,
-                                ],
+                // Replace any existing filter with an AND for our custom filters.
+                $es_query_args['filter'] = [
+                        'and' => $es_query_args['filter'] ? [ $es_query_args['filter'] ] : [],
+                ];
+
+                // Exclude 'disabled' plugins. This is separate from the 'status' field, which is used for the plugin status.
+                $es_query_args['filter']['and'] = [
+                        'terms' => [
+                                'disabled' => false,
                         ]
                 ];
 
+                // Limit to the Block Directory.
                 if ( $this->is_block_search ) {
-                        // Limit to the Block Tax.
                         $es_query_args['filter']['and'][] = [
-                                'term' => [
-                                        'taxonomy.plugin_section.name' => [
-                                                'value' => 'block'
-                                        ]
+                                'terms' => [
+                                        'taxonomy.plugin_section.name' => 'block',
                                 ]
                         ];