Changeset 10115

Timestamp:

08/05/2020 01:29:30 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: API: Ensure searches use the correct locale when performing an ElasticSearch search.

See #2977.

Location:

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

Files:

• api/routes/class-query-plugins.php (modified) (1 diff)
• libs/site-search/jetpack-search.php (modified) (1 diff)
• standalone/class-plugins-info-api-request.php (modified) (1 diff)

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

@@ -23 +23 @@
         'installed_plugins',
         'plugin_tags',
+        'locale',
     );
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php

@@ -430 +430 @@
         }
 
-        $es_wp_query_args['locale'] = get_locale();
+        $es_wp_query_args['locale'] = $query->get( 'locale' ) ?: get_locale();
 
         // You can use this filter to modify the search query parameters, such as controlling the post_type.

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api-request.php

@@ -242 +242 @@
         }
 
+        // Locale
+        $query['locale'] = $this->locale;
+
         return $query;
     }