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

Timestamp:

04/10/2017 09:53:03 PM (8 years ago)

Author:

ocean90

Message:

Plugin Directory: Don't use Jetpack Search if the site isn't connected.

Makes the search available in the meta environment.

File:

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

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

@@ -470 +470 @@
 
         // Instantiate our copy of the Jetpack_Search class.
-        if ( class_exists( 'Jetpack' ) && ! class_exists( 'Jetpack_Search' ) 
-            && !isset( $_GET['s'] ) ) { // Don't run the ES query if we're going to redirect to the pretty search URL
+        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();
@@ -813 +813 @@
     public function bypass_options_cache( $value, $option ) {
         global $wpdb;
-        $value = $wpdb->get_var( 
+        $value = $wpdb->get_var(
             $wpdb->prepare(
-                "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", 
+                "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1",
                 $option
             )
@@ -1025 +1025 @@
             die();
         }
-    
+
         // We've disabled WordPress's default 404 redirects, so we'll handle them ourselves.
         if ( is_404() ) {
@@ -1189 +1189 @@
     /**
      * Create a new post entry for a given plugin slug.
-     * 
+     *
      * @static
      *