Changeset 12284

Timestamp:

11/15/2018 07:03:35 PM (7 years ago)

Author:

boonebgorges

Message:

Emails: Ensure that default email tokens are pulled from root blog.

The email post type is always stored on the root blog, so we should be
sure to switch to that blog whenever referencing the post (such as
when pulling postmeta related to the post).

Fixes #7996.

Location:

trunk/src/bp-core

Files:

• bp-core-filters.php (modified) (2 diffs)
• classes/class-bp-email.php (modified) (2 diffs)

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

@@ -1036 +1036 @@
 function bp_email_set_default_tokens( $tokens, $property_name, $transform, $email ) {
     $tokens['site.admin-email'] = bp_get_option( 'admin_email' );
-    $tokens['site.url']         = home_url();
+    $tokens['site.url']         = bp_get_root_domain();
     $tokens['email.subject']    = $email->get_subject();
 
@@ -1081 +1081 @@
 
     // Email preheader.
-    $post = $email->get_post_object();
-    if ( $post ) {
-        $tokens['email.preheader'] = sanitize_text_field( get_post_meta( $post->ID, 'bp_email_preheader', true ) );
+    $preheader = $email->get_preheader();
+    if ( $preheader ) {
+        $tokens['email.preheader'] = $preheader;
     }
 

trunk/src/bp-core/classes/class-bp-email.php

@@ -71 +71 @@
 
     /**
+     * Email preheader.
+     *
+     * @since 4.0.0
+     *
+     * @var string
+     */
+    protected $preheader = null;
+
+    /**
      * Email headers.
      *
@@ -271 +280 @@
          */
         return apply_filters( 'bp_email_get_property', $retval, $property_name, $transform, $this );
+    }
+
+    /**
+     * Get email preheader.
+     *
+     * @since 4.0.0
+     */
+    public function get_preheader() {
+        if ( null !== $this->preheader ) {
+            return $this->preheader;
+        }
+
+        $preheader = '';
+
+        $post = $this->get_post_object();
+        if ( $post ) {
+            $switched = false;
+
+            // Switch to the root blog, where the email post lives.
+            if ( ! bp_is_root_blog() ) {
+                switch_to_blog( bp_get_root_blog_id() );
+                $switched = true;
+            }
+
+            $preheader = sanitize_text_field( get_post_meta( $post->ID, 'bp_email_preheader', true ) );
+
+            if ( $switched ) {
+                restore_current_blog();
+            }
+        }
+
+        $this->preheader = $preheader;
+
+        return $this->preheader;
     }