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

Timestamp:

03/14/2024 03:26:56 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Adjust the query customisations to allow for custom sorting.

This doesn't expose any UI, but provides the underlying API required for supporting it.

See #2753.

File:

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

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

@@ -183 +183 @@
         // 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' => [
-              0 => [
-                'term' => [
-                  'disabled' => [
+        $es_query_args['filter']['and'][] = [
+            'term' => [
+                'disabled' => [
                     'value' => false,
-                  ],
-                ],
-            ],
+                ],
             ]
         ];
@@ -207 +205 @@
         }
 
-        if ( $query->get( 'plugin_business_model' ) ) {
-            $es_query_args['filter']['and'][] = [
-                'term' => [
-                    'taxonomy.plugin_business_model.name' => [
-                        'value' => $query->get( 'plugin_business_model' )
-                    ]
-                ]
-            ];
-        }
-
         // Set boost on the match query
 
@@ -232 +220 @@
             unset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][0][ 'multi_match' ][ 'operator' ] );
         }
-
 
         // Some extra fields here