Changeset 4484

Timestamp:

06/11/2011 01:51:15 AM (13 years ago)

Author:

boonebgorges

Message:

Adjustments to installation and catch_uri process for BP_ENABLE_MULTIBLOG

Location:

trunk/bp-core

Files:

• admin/bp-core-update.php (modified) (1 diff)
• bp-core-catchuri.php (modified) (1 diff)

trunk/bp-core/admin/bp-core-update.php

@@ -1001 +1001 @@
             @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
 
-            // Load BP, so that the redirect is successful
+            // Load BP and hook the admin menu, so that the redirect is successful
             require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
+            bp_core_add_admin_menu();
 
             // Redirect to the BuddyPress dashboard

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

@@ -67 +67 @@
 
     // Running off blog other than root
-    if ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) {
+    if ( is_multisite() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) ) {
 
         // Any subdirectory names must be removed from $bp_uri.