Ticket #6892: 6892.02.patch

src/bp-core/bp-core-update.php

@@ -206 +206 @@
 
         require_once( buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php' );
 
+        // Used to check if we need to restore the blog
+        $needs_reset = false;
+
+        if ( is_multisite() && ! bp_is_root_blog() ) {
+                $needs_reset = true;
+
+                // Make sure the current blog is set to the root blog
+                switch_to_blog( bp_get_root_blog_id() );
+        }
+
         // Install BP schema and activate only Activity and XProfile.
         if ( bp_is_install() ) {
 
@@ -272 +282 @@
 
         // Bump the version.
         bp_version_bump();
+
+        // Restore the current blog if needed
+        if ( true === $needs_reset ) {
+                restore_current_blog();
+        }
 }
 
 /**