Changeset 4602 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

07/04/2011 04:59:01 PM (14 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-core/bp-core-catchuri.php (modified) (2 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -37 +37 @@
     // on multiple blogs
     if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
-        if ( BP_ROOT_BLOG != (int) $wpdb->blogid )
+        if ( bp_get_root_blog_id() != (int) $wpdb->blogid )
             return false;
     }
@@ -67 +67 @@
 
     // Running off blog other than root
-    if ( is_multisite() && !is_subdomain_install() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) ) {
+    if ( is_multisite() && !is_subdomain_install() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != bp_get_root_blog_id() ) ) {
 
         // Any subdirectory names must be removed from $bp_uri.