Changeset 6300

Timestamp:

09/04/2012 02:17:13 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Theme Functions:

• Do not include buddypress-functions.php when deactivating BuddyPress.
• Prevents including functions with dependencies that are not available anymore.

File:

• trunk/bp-core/bp-core-template-loader.php (modified) (1 diff)

trunk/bp-core/bp-core-template-loader.php

@@ -273 +273 @@
     global $pagenow;
 
-    if ( ! defined( 'WP_INSTALLING' ) || ( !empty( $pagenow ) && ( 'wp-activate.php' !== $pagenow ) ) ) {
+    // Do not include on BuddyPress deactivation
+    if ( bp_is_deactivation() )
+        return;
+
+    // Only include if not installing or if activating via wp-activate.php
+    if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
         bp_locate_template( 'buddypress-functions.php', true );
     }