Changeset 11528

Timestamp:

02/08/2022 05:20:50 AM (5 years ago)

Author:

dd32

Message:

Support Forums: Emails: Prefix the plugin/theme name to the email subject for reply notifications to a topic.

Previously this was only applying to notifications of new topics / new replies to topics in subscribed terms, rather than also applying to replies to threads you participated in.

See #6079, #2016.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php (modified) (7 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php

@@ -57 +57 @@
                 add_action( 'bbp_new_reply', array( $this, 'notify_term_subscribers_of_new_reply' ), 10, 5 );
 
+                // Replace the title of subscription emails with the term-specific prefix.
+                // This applies to all notification emails sent related to the topic, not just the term-specific emails.
+                add_filter( 'bbp_forum_subscription_mail_title', array( $this, 'replace_forum_subscription_mail_title' ), 10, 2 );
+                add_filter( 'bbp_subscription_mail_title',       array( $this, 'replace_topic_subscription_mail_title' ), 10, 3 );
+
                 add_action( 'bbp_template_after_user_subscriptions', array( $this, 'user_subscriptions' ) );
+
         }
 
@@ -188 +194 @@
                 // Replace forum-specific messaging with term subscription messaging.
                 add_filter( 'bbp_forum_subscription_mail_message', array( $this, 'replace_forum_subscription_mail_message' ), 10, 4 );
-                add_filter( 'bbp_forum_subscription_mail_title',   array( $this, 'replace_forum_subscription_mail_title' ), 10, 2 );
 
                 // Replace forum subscriber list with term subscribers, avoiding duplicates.
@@ -199 +204 @@
                 remove_filter( 'bbp_forum_subscription_user_ids',     array( $this, 'add_term_subscribers_to_forum' ) );
                 remove_filter( 'bbp_forum_subscription_mail_message', array( $this, 'replace_forum_subscription_mail_message' ), 10 );
-                remove_filter( 'bbp_forum_subscription_mail_title',   array( $this, 'replace_forum_subscription_mail_title' ) );
 
         }
@@ -256 +260 @@
          */
         public function replace_forum_subscription_mail_title( $title, $topic_id ) {
+                $terms = get_the_terms( $topic_id, $this->taxonomy );
+                if ( ! $terms ) {
+                        return $title;
+                }
+
                 if ( $this->directory && $this->directory->title() ) {
                         $blog_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
@@ -306 +315 @@
                 // Replace topic-specific messaging with term subscription messaging.
                 add_filter( 'bbp_subscription_mail_message', array( $this, 'replace_topic_subscription_mail_message' ), 10, 3 );
-                add_filter( 'bbp_subscription_mail_title',   array( $this, 'replace_topic_subscription_mail_title' ), 10, 3 );
 
                 // Replace forum subscriber list with term subscribers, avoiding duplicates.
@@ -317 +325 @@
                 remove_filter( 'bbp_topic_subscription_user_ids', array( $this, 'add_term_subscribers_to_topic' ) );
                 remove_filter( 'bbp_subscription_mail_message',   array( $this, 'replace_topic_subscription_mail_message' ) );
-                remove_filter( 'bbp_subscription_mail_title',     array( $this, 'replace_topic_subscription_mail_title' ) );
         }
 
@@ -373 +380 @@
          */
         public function replace_topic_subscription_mail_title( $title, $reply_id, $topic_id ) {
+                $terms = get_the_terms( $topic_id, $this->taxonomy );
+                if ( ! $terms ) {
+                        return $title;
+                }
+
                 if ( $this->directory && $this->directory->title() ) {
                         $blog_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );