Changeset 7250

Timestamp:

03/08/2022 08:44:02 PM (3 years ago)

Author:

johnjamesjacoby

Message:

Subscriptions: use topic title in Subject, instead of site name.

This change adds helpful context to email subjects and eliminates duplication between From & Subject mail headers.

Props dd32.

In branches/2.6, for 2.6.10.

Fixes #3446.

File:

• branches/2.6/src/includes/common/functions.php (modified) (4 diffs)

branches/2.6/src/includes/common/functions.php

@@ -1140 +1140 @@
 
     // Strip tags from text and setup mail data
-    $blog_name         = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    $forum_title       = wp_specialchars_decode( strip_tags( bbp_get_forum_title( $forum_id ) ), ENT_QUOTES );
     $topic_title       = wp_specialchars_decode( strip_tags( bbp_get_topic_title( $topic_id ) ), ENT_QUOTES );
     $reply_author_name = wp_specialchars_decode( strip_tags( $reply_author_name ), ENT_QUOTES );
@@ -1170 +1170 @@
 
     // For plugins to filter titles per reply/topic/user
-    $subject = apply_filters( 'bbp_subscription_mail_title', '[' . $blog_name . '] ' . $topic_title, $reply_id, $topic_id );
+    $subject = apply_filters( 'bbp_subscription_mail_title', '[' . $forum_title . '] ' . $topic_title, $reply_id, $topic_id );
     if ( empty( $subject ) ) {
         return;
@@ -1307 +1307 @@
 
     // Strip tags from text and setup mail data
-    $blog_name         = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    $forum_title       = wp_specialchars_decode( strip_tags( bbp_get_forum_title( $forum_id ) ), ENT_QUOTES );
     $topic_title       = wp_specialchars_decode( strip_tags( bbp_get_topic_title( $topic_id ) ), ENT_QUOTES );
     $topic_author_name = wp_specialchars_decode( strip_tags( $topic_author_name ), ENT_QUOTES );
@@ -1337 +1337 @@
 
     // For plugins to filter titles per reply/topic/user
-    $subject = apply_filters( 'bbp_forum_subscription_mail_title', '[' . $blog_name . '] ' . $topic_title, $topic_id, $forum_id, $user_id );
+    $subject = apply_filters( 'bbp_forum_subscription_mail_title', '[' . $forum_title . '] ' . $topic_title, $topic_id, $forum_id, $user_id );
     if ( empty( $subject ) ) {
         return;