Changeset 6108 for trunk/bp-forums/bp-forums-loader.php

Timestamp:

06/18/2012 01:06:13 PM (12 years ago)

Author:

boonebgorges

Message:

Reinstates 1.5.x integration of bbPress 1.x forum installation and configuration

In anticipation for a full switchover to bbPress 2.x in BuddyPress 1.6, several
aspects of the forum configuration and setup process were modified. Since
the migration to bbPress 2.x is being put off to a later version of BuddyPress,
it's necessary to revert some of these changes back to their BP 1.5.x state.

This changeset also fixes a bug in the bb-config.php creation script, where
a salt containing the string '?>' could result in early termination of the
config file.

Fixes #4269

File:

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

trunk/bp-forums/bp-forums-loader.php

@@ -47 +47 @@
         if ( !defined( 'BP_FORUMS_SLUG' ) )
             define( 'BP_FORUMS_SLUG', $this->id );
+
+        // The location of the bbPress stand-alone config file
+        if ( isset( $bp->site_options['bb-config-location'] ) )
+            $this->bbconfig = $bp->site_options['bb-config-location'];
 
         // All globals for messaging component.