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

Timestamp:

04/18/2016 12:01:14 PM (9 years ago)

Author:

obenland

Message:

Plugins Directory: Avoid immediate dependency on Jetpack.

Fixes a fatal error when Jetpack is not activated on the site.

See #1574.

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

@@ -171 +171 @@
         }
 
-        // Instantiate our copy of the Jetpack_Search class if 
-        if ( !class_exists( 'Jetpack_Search' ) ) {
+        // Instantiate our copy of the Jetpack_Search class.
+        if ( class_exists( 'Jetpack' ) && ! class_exists( 'Jetpack_Search' ) ) {
             require_once( __DIR__ . '/libs/site-search/jetpack-search.php' );
             \Jetpack_Search::instance();