Ticket #1057: dance-around-the-deep.patch

bp-forums.php

@@ -7 +7 @@
 if ( !defined( 'BP_FORUMS_SLUG' ) )
         define( 'BP_FORUMS_SLUG', 'forums' );
 
-require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress.php' );
-require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-classes.php' );
-require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-templatetags.php' );
-require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-filters.php' );
+/* Don't load bbPress if using 'deep integration' */
+if ( !defined( 'BB_PATH' ) ) {
+        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress.php' );
+        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-classes.php' );
+        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-templatetags.php' );
+        require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-filters.php' );
+}
 
 function bp_forums_setup() {
         global $bp;