Changeset 10582

Timestamp:

02/12/2016 09:01:07 PM (11 years ago)

Author:

djpaul

Message:

Core: be on root blog when installing, and register taxonomies.

Similar to r10580, we needed to make sure the email type taxonomy is
registered when we switch_to_blog to install BuddyPress.

Fixes #6892

Props boonebgorges, DJPaul, imath

File:

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

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

@@ -206 +206 @@
 
         require_once( buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php' );
+        $switched_to_root_blog = false;
+
+        // Make sure the current blog is set to the root blog
+        if ( ! bp_is_root_blog() ) {
+                switch_to_blog( bp_get_root_blog_id() );
+                bp_register_taxonomies();
+
+                $switched_to_root_blog = true;
+        }
 
         // Install BP schema and activate only Activity and XProfile.
@@ -273 +282 @@
         // Bump the version.
         bp_version_bump();
+
+        if ( $switched_to_root_blog ) {
+                restore_current_blog();
+        }
 }