Changeset 4602 for trunk/bp-loader.php

Timestamp:

07/04/2011 04:59:01 PM (13 years ago)

Author:

johnjamesjacoby

Message:

• Swap BP_ROOT_BLOG const usage for new bp_get_root_blog_id() function
• Use bp_get_root_blog_id() place of bp_get_option_blog_id()
• Check for BP_ENABLE_MULTIBLOG when assigning root blog ID

See #3313, #3314.

File:

• trunk/bp-loader.php (modified) (2 diffs)

trunk/bp-loader.php

@@ -28 +28 @@
 // Define on which blog ID BuddyPress should run
 if ( !defined( 'BP_ROOT_BLOG' ) ) {
-    if ( is_multisite() ) {
+    
+    // Root blog is the main site on this network
+    if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
         $current_site = get_current_site();
         $root_blog_id = $current_site->blog_id;
-    } else {
+        
+    // Root blog is every site on this network
+    } elseif ( is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) ) {
+        $root_blog_id = get_current_blog_id();
+        
+    // Root blog is the only blog on this network
+    } elseif( !is_multisite() ) {
         $root_blog_id = 1;
     }
@@ -104 +112 @@
     // Switch the user to the new bp-default if they are using the old
     // bp-default on activation.
-    if ( 'bp-sn-parent' == get_blog_option( BP_ROOT_BLOG, 'template' ) && 'bp-default' == get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) )
+    if ( 'bp-sn-parent' == get_blog_option( bp_get_root_blog_id(), 'template' ) && 'bp-default' == get_blog_option( bp_get_root_blog_id(), 'stylesheet' ) )
         switch_theme( 'bp-default', 'bp-default' );