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

Timestamp:

06/03/2019 02:50:54 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: Search: Use wp_json_encode() to handle non-UTF8 queries better. Don't attempt a search if we can't encode the JSON.

This should reduce the amount of 400 Bad Request's we trigger against the Jetpack Search API.

File:

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

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

@@ -223 +223 @@
     public function search( $es_args ) {
         $service_url  = 'https://public-api.wordpress.com/rest/v1/sites/' . $this->jetpack_blog_id . '/search';
-        $json_es_args = json_encode( $es_args );
+        $json_es_args = wp_json_encode( $es_args );
         $cache_key    = md5( $json_es_args );
         $lock_key     = 'lock-' . $cache_key;
         $count_key    = 'count-' . $cache_key;
 
+        // If the Query args were not able to be encoded, bail.
+        if ( ! $json_es_args ) {
+            return false;
+        }
+
         $response = wp_cache_get( $cache_key, self::CACHE_GROUP );
-
 
         // Use a temporary lock to prevent cache stampedes.