Ticket #3135: bp-core-catchuri.php-wpmu.diff

bp-core/bp-core-catchuri.php

@@ -27 +27 @@
  */
 function bp_core_set_uri_globals() {
         global $bp, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
-        global $current_blog, $wpdb;
+        global $current_blog, $wpdb,$wpmu_version;
 
         // Create global component, action, and item variables
         $bp->current_component = $bp->current_action = $bp->current_item ='';
@@ -35 +35 @@
 
         // Only catch URI's on the root blog if we are not running
         // on multiple blogs
-        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
+        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && 
+                        ((function_exists('is_multisite') && is_multisite()) || !empty($wpmu_version) )) {
                 if ( BP_ROOT_BLOG != (int) $wpdb->blogid )
                         return false;
         }