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

Timestamp:

05/02/2024 07:59:36 AM (2 years ago)

Author:

dd32

Message:

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

The root-cause here is that the plugin_section needs to be limited by slug, rather than name.
Otherwise, { name:'Block-Enabled plugins', slug:'blocks'} matches a name = block query.

See [13648].
See ​https://wordpress.slack.com/archives/C1LBM36LC/p1714627935853749
See ​https://wordpress.slack.com/archives/C02QB8GMM/p1714634228857259

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.
+                // Replace any existing filter with an AND for our custom filters.
+                if ( ! isset( $es_query_args['filter']['and'] ) ) {
+                        // 'filter' will either be an `and` or term we need to wrap in an `and`.
+                        $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'][] = [
                         'term' => [
-                                'disabled' => [
-                                        'value' => false,
-                                ],
+                                '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'
-                                        ]
+                                        'taxonomy.plugin_section.slug' => 'block',
                                 ]
                         ];