Ticket #7996: 7996.02.patch

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

@@ -1035 +1035 @@
  */
 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();
 
         // These options are escaped with esc_html on the way into the database in sanitize_option().
@@ -1080 +1080 @@
         }
 
         // 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;
         }
 
         return $tokens;

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

@@ -69 +69 @@
          */
         protected $from = null;
 
+        /**
+         * Email preheader.
+         *
+         * @since 4.0.0
+         *
+         * @var string
+         */
+        protected $preheader = null;
+
         /**
          * Email headers.
          *
@@ -272 +281 @@
                 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;
+        }
+
         /**
          * Get email headers.
          *