Ticket #6892: 6892.patch

src/bp-core/admin/bp-core-admin-schema.php

@@ -533 +533 @@
  * @since 2.5.0
  */
 function bp_core_install_emails() {
+        $needs_reset = false;
+
+        if ( is_multisite() && ! bp_is_root_blog() ) {
+                $needs_reset = true;
+
+                switch_to_blog( bp_get_root_blog_id() );
+        }
+
         $defaults = array(
                 'post_status' => 'publish',
                 'post_type'   => bp_get_email_post_type(),
@@ -703 +711 @@
                 }
         }
 
+        if ( true === $needs_reset ) {
+                restore_current_blog();
+        }
+
         /**
          * Fires after BuddyPress adds the posts for its emails.
          *