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

Timestamp:

08/05/2020 01:36:05 AM (4 years ago)

Author:

dd32

Message:

Plugin Directory: Search: Load ElasticSearch on direct rest api requests, even though ?s= might be set.

This allows for ElasticSearch to load while debugging search when directly accessing the rest api.
This is only useful for debugging, as searches through api.wordpress.org do not set $_GET['s'].

File:

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

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

@@ -560 +560 @@
 
         // Instantiate our copy of the Jetpack_Search class.
-        if ( class_exists( 'Jetpack' ) && \Jetpack::get_option( 'id' ) && ! class_exists( 'Jetpack_Search' )
-            && ! isset( $_GET['s'] ) ) { // Don't run the ES query if we're going to redirect to the pretty search URL
-                require_once __DIR__ . '/libs/site-search/jetpack-search.php';
-                \Jetpack_Search::instance();
+        if (
+            class_exists( 'Jetpack' ) &&
+            \Jetpack::get_option( 'id' ) && // Don't load in Meta Environments
+            ! class_exists( 'Jetpack_Search' ) &&
+            (
+                // Don't run the ES query if we're going to redirect to the pretty search URL
+                ! isset( $_GET['s'] )
+            ||
+                // But load it for the query-plugins REST API endpoint, for simpler debugging
+                ( false !== strpos( $_SERVER['REQUEST_URI'], 'wp-json/plugins/v1/query-plugins' ) )
+            )
+        ) {
+            require_once __DIR__ . '/libs/site-search/jetpack-search.php';
+            \Jetpack_Search::instance();
         }
     }