Ticket #2618: 2618.3.diff

src/includes/common/functions.php

@@ -1062 +1062 @@
         $reply_content = strip_tags( bbp_get_reply_content( $reply_id ) );
         $reply_url     = bbp_get_reply_url( $reply_id );
         $blog_name     = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-        $do_not_reply  = '<noreply@' . ltrim( get_home_url(), '^(http|https)://' ) . '>';
+        $do_not_reply  = 'noreply@' . ltrim( get_home_url(), '^(http|https)://' );
 
+        $from_email    = apply_filters( 'bbp_subscription_from_email', $do_not_reply );
+
         // For plugins to filter messages per reply/topic/user
         $message = sprintf( __( '%1$s wrote:
 
@@ -1099 +1101 @@
         $headers = array();
 
         // Setup the From header
-        $headers[] = 'From: ' . get_bloginfo( 'name' ) . ' ' . $do_not_reply;
+        $headers[] = 'From: ' . get_bloginfo( 'name' ) . ' <' . $from_email . '>';
 
         // Get topic subscribers and bail if empty
         $user_ids = bbp_get_topic_subscribers( $topic_id, true );
@@ -1122 +1124 @@
         /** Send it ***************************************************************/
 
         // Custom headers
-        $headers = apply_filters( 'bbp_subscription_mail_headers', $headers );
+        $headers  = apply_filters( 'bbp_subscription_mail_headers', $headers );
+        $to_email = apply_filters( 'bbp_subscription_to_email', $do_not_reply );
 
         do_action( 'bbp_pre_notify_subscribers', $reply_id, $topic_id, $user_ids );
 
         // Send notification email
-        wp_mail( $do_not_reply, $subject, $message, $headers );
+        wp_mail( $to_email, $subject, $message, $headers );
 
         do_action( 'bbp_post_notify_subscribers', $reply_id, $topic_id, $user_ids );
 
@@ -1202 +1205 @@
         $topic_content = strip_tags( bbp_get_topic_content( $topic_id ) );
         $topic_url     = get_permalink( $topic_id );
         $blog_name     = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-        $do_not_reply  = '<noreply@' . ltrim( get_home_url(), '^(http|https)://' ) . '>';
+        $do_not_reply  = 'noreply@' . ltrim( get_home_url(), '^(http|https)://' );
 
+        $from_email    = apply_filters( 'bbp_subscription_from_email', $do_not_reply );
+
         // For plugins to filter messages per reply/topic/user
         $message = sprintf( __( '%1$s wrote:
 
@@ -1239 +1244 @@
         $headers = array();
 
         // Setup the From header
-        $headers[] = 'From: ' . get_bloginfo( 'name' ) . ' ' . $do_not_reply;
+        $headers[] = 'From: ' . get_bloginfo( 'name' ) . ' <' . $from_email . '>';
 
         // Get topic subscribers and bail if empty
         $user_ids = bbp_get_forum_subscribers( $forum_id, true );
@@ -1262 +1267 @@
         /** Send it ***************************************************************/
 
         // Custom headers
-        $headers = apply_filters( 'bbp_subscription_mail_headers', $headers );
+        $headers  = apply_filters( 'bbp_subscription_mail_headers', $headers );
+        $to_email = apply_filters( 'bbp_subscription_to_email', $do_not_reply );
 
         do_action( 'bbp_pre_notify_forum_subscribers', $topic_id, $forum_id, $user_ids );
 
         // Send notification email
-        wp_mail( $do_not_reply, $subject, $message, $headers );
+        wp_mail( $to_email, $subject, $message, $headers );
 
         do_action( 'bbp_post_notify_forum_subscribers', $topic_id, $forum_id, $user_ids );