Ticket #4148: switch_theme-bp_active-order-change-4148.patch

bp-default/functions.php

@@ -30 +30 @@
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
 
-if ( ! function_exists( 'bp_is_active' ) )
-        return;
 
-// If BuddyPress is not activated, switch back to the default WP theme
+
+// If BuddyPress is not activated, switch back to the default WP theme first
 if ( ! defined( 'BP_VERSION' ) )
         switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
 
+// And then escape from further action
+if ( ! function_exists( 'bp_is_active' ) )
+        return;
+        
 /**
  * Set the content width based on the theme's design and stylesheet.
  *