<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[8081] sites/trunk/wordpress.org/public_html/wp-content/plugins: Support Forums: Prefix notifications from the Plugin/Theme forums with the plugin name.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/8081">8081</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8081","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-01-15 03:10:41 +0000 (Tue, 15 Jan 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Support Forums: Prefix notifications from the Plugin/Theme forums with the plugin name.
For example: [WordPress.org] [Example Plugin Name] Example Topic Title.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2016">#2016</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasssupportcompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasssupportcompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php 2019-01-14 10:16:20 UTC (rev 8080)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php 2019-01-15 03:10:41 UTC (rev 8081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,21 +354,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function load_compat_subscriptions() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( 'WordPressdotorg\Forums\Term_Subscription\Plugin' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Plugin::get_instance()->plugin_subscriptions = new Term_Subscription\Plugin( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'taxonomy' => 'topic-plugin',
- 'labels' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => 'topic-plugin',
+ 'directory' => Plugin::get_instance()->plugins,
+ 'labels' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_header' => __( 'Subscribed Plugins', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_user_notice' => __( 'You are not currently subscribed to any plugins.', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_anon_notice' => __( 'This user is not currently subscribed to any plugins.', 'wporg-forums' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'receipt' => __( 'You are receiving this email because you are subscribed to a plugin.', 'wporg-forums' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Plugin Name. */
+ 'receipt' => __( 'You are receiving this email because you are subscribed to the %s plugin.', 'wporg-forums' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> Plugin::get_instance()->theme_subscriptions = new Term_Subscription\Plugin( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'taxonomy' => 'topic-theme',
- 'labels' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => 'topic-theme',
+ 'directory' => Plugin::get_instance()->themes,
+ 'labels' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_header' => __( 'Subscribed Themes', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_user_notice' => __( 'You are not currently subscribed to any themes.', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_anon_notice' => __( 'This user is not currently subscribed to any themes.', 'wporg-forums' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'receipt' => __( 'You are receiving this email because you are subscribed to a theme.', 'wporg-forums' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Theme Name. */
+ 'receipt' => __( 'You are receiving this email because you are subscribed to the %s theme.', 'wporg-forums' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +397,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT post_name
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$prefix}posts AS p
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$prefix}term_relationships AS tr ON p.ID = tr.object_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LEFT JOIN {$prefix}term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ LEFT JOIN {$prefix}term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id
</ins><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$prefix}terms AS t ON tt.term_id = t.term_id
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE tt.taxonomy = 'plugin_committers' AND p.post_status = 'publish' AND p.post_type = 'plugin' AND t.slug = %s
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY p.post_title ASC",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT post_name
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$prefix}posts AS p
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$prefix}term_relationships AS tr ON p.ID = tr.object_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LEFT JOIN {$prefix}term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ LEFT JOIN {$prefix}term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id
</ins><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$prefix}terms AS t ON tt.term_id = t.term_id
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE tt.taxonomy = 'plugin_contributors' AND p.post_status = 'publish' AND p.post_type = 'plugin' AND t.slug = %s
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY p.post_title ASC",
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2019-01-14 10:16:20 UTC (rev 8080)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2019-01-15 03:10:41 UTC (rev 8081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,15 +11,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> private $subscribers = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $taxonomy = false;
- public $labels = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $taxonomy = false;
+ public $labels = array();
+ public $directory = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const META_KEY = '_bbp_term_subscription';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'taxonomy' => 'topic-tag',
- 'labels' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => 'topic-tag',
+ 'directory' => false,
+ 'labels' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_header' => __( 'Subscribed Topic Tags', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_user_notice' => __( 'You are not currently subscribed to any topic tags.', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscribed_anon_notice' => __( 'This user is not currently subscribed to any topic tags.', 'wporg-forums' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,8 +29,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->taxonomy = $r['taxonomy'];
- $this->labels = $r['labels'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->taxonomy = $r['taxonomy'];
+ $this->labels = $r['labels'];
+ $this->directory = $r['directory'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_init', array( $this, 'bbp_init' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $anonymous_data Array of anonymous user data
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $topic_author The topic author id
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function notify_term_subscribers_of_new_topic( $topic_id, $forum_id, $anonymous_data = false, $topic_author = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function notify_term_subscribers_of_new_topic( $topic_id, $forum_id, $anonymous_data = false, $topic_author = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = get_the_terms( $topic_id, $this->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $terms ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,6 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace forum-specific messaging with term subscription messaging.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_forum_subscription_mail_message', array( $this, 'replace_forum_subscription_mail_message' ), 10, 4 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bbp_forum_subscription_mail_title', array( $this, 'replace_forum_subscription_mail_title' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace forum subscriber list with term subscribers, avoiding duplicates.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_forum_subscription_user_ids', array( $this, 'add_term_subscribers_to_forum' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,8 +196,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_notify_forum_subscribers( $topic_id, $forum_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove filters.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bbp_forum_subscription_user_ids', array( $this, 'add_term_subscribers_to_forum' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'bbp_forum_subscription_user_ids', array( $this, 'add_term_subscribers_to_forum' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'bbp_forum_subscription_mail_message', array( $this, 'replace_forum_subscription_mail_message' ), 10 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'bbp_forum_subscription_mail_title', array( $this, 'replace_forum_subscription_mail_title' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +241,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $topic_author_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $topic_content,
</span><span class="cx" style="display: block; padding: 0 10px"> $topic_url,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->labels['receipt']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // String may not have placeholders, ie. in the case of tags.
+ sprintf( $this->labels['receipt'], $this->directory ? $this->directory->title() : '' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $message;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,6 +249,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Replace the forum subscription subject/title with term-specific messaging.
+ *
+ * @param string $title The current title
+ * @param int $topic_id The topic id
+ */
+ public function replace_forum_subscription_mail_title( $title, $topic_id ) {
+ if ( $this->directory && $this->directory->title() ) {
+ $blog_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+ $topic_title = strip_tags( bbp_get_topic_title( $topic_id ) );
+
+ // [WordPress.org] [Plugin Name] This is my threads
+ $title = sprintf( '[%s] [%s] %s', $blog_name, $this->directory->title(), $topic_title );
+ }
+
+ return $title;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Use the existing bbp_notify_topic_subscribers() to send out term subscriptions for replies.
</span><span class="cx" style="display: block; padding: 0 10px"> * Avoid duplicate notifications for topic subscribers through the judicious use of filters within
</span><span class="cx" style="display: block; padding: 0 10px"> * the function.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,6 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace topic-specific messaging with term subscription messaging.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_subscription_mail_message', array( $this, 'replace_topic_subscription_mail_message' ), 10, 3 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bbp_subscription_mail_title', array( $this, 'replace_topic_subscription_mail_title' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace forum subscriber list with term subscribers, avoiding duplicates.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_topic_subscription_user_ids', array( $this, 'add_term_subscribers_to_topic' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +315,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove filters.
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'bbp_topic_subscription_user_ids', array( $this, 'add_term_subscribers_to_topic' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bbp_subscription_mail_message', array( $this, 'replace_topic_subscription_mail_message' ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +357,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $reply_author_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $reply_content,
</span><span class="cx" style="display: block; padding: 0 10px"> $reply_url,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->labels['receipt']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // String may not have placeholders, ie. in the case of tags.
+ sprintf( $this->labels['receipt'], $this->directory ? $this->directory->title() : '' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $message;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,6 +365,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Replace the topic subscription subject/title with term-specific messaging.
+ *
+ * @param string $title The current title
+ * @param int $reply_id The reply id
+ * @param int $topic_id The topic id
+ */
+ public function replace_topic_subscription_mail_title( $title, $reply_id, $topic_id ) {
+ if ( $this->directory && $this->directory->title() ) {
+ $blog_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+ $topic_title = strip_tags( bbp_get_topic_title( $topic_id ) );
+
+ // [WordPress.org] [Plugin Name] This is my threads
+ $title = sprintf( '[%s] [%s] %s', $blog_name, $this->directory->title(), $topic_title );
+ }
+
+ return $title;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Add a term subscription block to the user's profile.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function user_subscriptions() {
</span></span></pre>
</div>
</div>
</body>
</html>