Changeset 10484

Timestamp:

01/30/2016 09:41:55 PM (10 years ago)

Author:

djpaul

Message:

Emails: make sure we are on root blog when fetching email posts.

Potential compatibility fix for various multisite configurations,
especially with third-party plugins.

Props r-a-y

See #6592

File:

• trunk/src/bp-core/bp-core-functions.php (modified) (3 diffs)

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

@@ -2763 +2763 @@
  */
 function bp_get_email( $email_type ) {
+    $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;
+    }
+
     $args = array(
         'no_found_rows'    => true,
@@ -2790 +2798 @@
     $post = get_posts( $args );
     if ( ! $post ) {
+        if ( $switched ) {
+            restore_current_blog();
+        }
+
         return new WP_Error( 'missing_email', __FUNCTION__, array( $email_type, $args ) );
     }
@@ -2825 +2837 @@
      * @param WP_Post[] All posts retrieved by get_posts( $args ). May only contain $post.
      */
-    return apply_filters( 'bp_get_email', $email, $email_type, $args, $post );
+    $retval = apply_filters( 'bp_get_email', $email, $email_type, $args, $post );
+
+    if ( $switched ) {
+        restore_current_blog();
+    }
+
+    return $retval;
 }