Changeset 10486

Timestamp:

01/31/2016 05:30:30 PM (9 years ago)

Author:

djpaul

Message:

Emails: make sure we are on root blog when redirecting to email customiser, or running the email repair tool.

See #6592

Location:

trunk/src/bp-core

Files:

• admin/bp-core-admin-tools.php (modified) (2 diffs)
• bp-core-customizer-email.php (modified) (2 diffs)

trunk/src/bp-core/admin/bp-core-admin-tools.php

@@ -428 +428 @@
  */
 function bp_admin_reinstall_emails() {
+    $switched = false;
+
+    // Switch to the root blog, where the email posts live.
+    if ( ! bp_is_root_blog() ) {
+        switch_to_blog( bp_get_root_blog_id() );
+        $switched = true;
+    }
+
     $emails = get_posts( array(
         'fields'           => 'ids',
@@ -445 +453 @@
     bp_core_install_emails();
 
+    if ( $switched ) {
+        restore_current_blog();
+    }
+
     return array( 0, __( 'Emails have been successfully reinstalled.', 'buddypress' ) );
 }

trunk/src/bp-core/bp-core-customizer-email.php

@@ -393 +393 @@
  */
 function bp_email_redirect_to_customizer() {
+    $switched = false;
+
+    // Switch to the root blog, where the email posts live.
+    if ( ! bp_is_root_blog() ) {
+        switch_to_blog( bp_get_root_blog_id() );
+        $switched = true;
+    }
+
     $email = get_posts( array(
         'fields'           => 'ids',
@@ -418 +426 @@
     );
 
+    if ( $switched ) {
+        restore_current_blog();
+    }
+
     printf(
         '<script type="text/javascript">window.location = "%s";</script>',