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

Timestamp:

07/09/2011 07:14:50 PM (14 years ago)

Author:

boonebgorges

Message:

Introduces bp_is_multiblog_mode() to reduce BP_ENABLE_MULTIBLOG checks throughout. See #3314

File:

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

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

@@ -34 +34 @@
     $bp->action_variables = $bp->displayed_user->id = '';
 
-    // Only catch URI's on the root blog if we are not running
-    // on multiple blogs
-    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
-        if ( bp_get_root_blog_id() != (int) $wpdb->blogid )
-            return false;
+    // Don't catch URIs on non-root blogs unless multiblog mode is on
+    if ( !bp_is_root_blog() && !bp_is_multiblog_mode() ) {
+        return false;
     }
 
@@ -67 +65 @@
 
     // Running off blog other than root
-    if ( is_multisite() && !is_subdomain_install() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != bp_get_root_blog_id() ) ) {
+    if ( is_multisite() && !is_subdomain_install() && ( bp_is_multiblog_mode() || 1 != bp_get_root_blog_id() ) ) {
 
         // Any subdirectory names must be removed from $bp_uri.