Changeset 5885 for trunk/bp-forums/bp-forums-functions.php

Timestamp:

03/05/2012 06:17:43 AM (13 years ago)

Author:

johnjamesjacoby

Message:

First pass at rearranging settings and forums settings screens to accommodate bbPress 2.x migration:

• Simplify and move old bb-config.php file write logic into Settings screen
• Introduce new functions for checking what possible mode the Forums screen is in
• Deprecate old forum admin code for now, will probably be removed later
• Deprecate $bp->bbconfig setting and use bp_get_option() instead
• Clean up the Settings screen and add dedicated groups for Profiles and Forums
• See #3598
• More to do

File:

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

trunk/bp-forums/bp-forums-functions.php

@@ -1 +1 @@
 <?php
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
+/** bbPress 2.x ***************************************************************/
+
+/**
+ * Used to see if bbPress 2.x is installed and active
+ *
+ * @since BuddyPress (1.6)
+ * @return boolean True if bbPress 2.x is active, false if not
+ */
+function bp_forums_is_bbpress_active() {
+
+    // Single site
+    if ( is_plugin_active( 'bbpress/bbpress.php' ) )
+        return true;
+
+    // Network active
+    if ( is_plugin_active_for_network( 'bbpress/bbpress.php' ) )
+        return true;
+
+    // Nope
+    return false;
+}
+
+/** bbPress 1.x ***************************************************************/
+
+/**
+ * If the bb-config-location option exists, bbPress 1.x was previously installed
+ *
+ * @since BuddyPress (1.2)
+ * @return boolean True if option exists, false if not
+ */
 function bp_forums_is_installed_correctly() {
-    global $bp;
-
-    if ( isset( $bp->forums->bbconfig ) && is_file( $bp->forums->bbconfig ) )
+    if ( bp_get_option( 'bb-config-location' ) )
         return true;