<!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>[4005] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription: Support Forums: Allow other taxonomies to use term subscriptions.</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 { 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/4005">4005</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/4005","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jmdodd</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-08 19:14:18 +0000 (Thu, 08 Sep 2016)</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: Allow other taxonomies to use term subscriptions.
Abstract term subscriptions plugin so that it defaults to the `topic-tag` taxonomy, but can be reused by other taxonomies for notifications.
Converts plugin from a singleton to allow multiple instances.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionwporgbbptermsubscriptionphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/wporg-bbp-term-subscription.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2016-09-08 12:27:21 UTC (rev 4004)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2016-09-08 19:14:18 UTC (rev 4005)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,37 +5,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Plugin {
</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">- * @todo Subscribe/unsubscribe link in topic view sidebar next to topic tag.
</del><span class="cx" style="display: block; padding: 0 10px"> * @todo AJAXify subscription action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @todo Abstract for plugin/theme taxonomies as needed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Add unsubscribe link to outgoing emails.
</ins><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">- private $subscribers;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $subscribers = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * @var Plugin The singleton instance.
- */
- private static $instance;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $taxonomy = false;
+ public $labels = array();
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Always return the same instance of this plugin.
- *
- * @return Plugin
- */
- public static function get_instance() {
- if ( ! ( self::$instance instanceof Plugin ) ) {
- self::$instance = new Plugin();
- }
- return self::$instance;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $args = array() ) {
+ $r = wp_parse_args( $args, array(
+ 'taxonomy' => 'topic-tag',
+ 'labels' => array(
+ 'receipt' => __( 'You are receiving this email because you are subscribed to a topic tag.', 'wporg-forums'),
+ ),
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Instantiate a new Plugin object.
- */
- private function __construct() {
- $this->subscribers = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->taxonomy = $r['taxonomy'];
+ $this->labels = $r['labels'];
</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">@@ -44,11 +34,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Initialize the plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function bbp_init() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = get_current_user_id();
- if ( ! $user_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the user isn't logged in, there will be no topics or replies added.
+ if ( ! is_user_logged_in() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ if ( ! $this->taxonomy ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add views and actions for users.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_get_request', array( $this, 'term_subscribe_handler' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,11 +52,21 @@
</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">- * Handle a user subscribing to and unsubscribing from a topic tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Handle a user subscribing to and unsubscribing from a term that is
+ * in the taxonomy of this instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $action The requested action to compare this function to
</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 static function term_subscribe_handler( $action = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function term_subscribe_handler( $action = '' ) {
+ if ( ! $this->taxonomy ) {
+ return;
+ }
+
+ // Taxonomy mismatch; a different instance should handle this.
+ if ( $this->taxonomy != $_GET['taxonomy'] ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbp_is_subscriptions_active() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,14 +77,14 @@
</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"> // Bail if no term id is passed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_GET['term_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_GET['term_id'] ) || empty( $_GET['taxonomy'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> // Get required data.
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id = intval( $_GET['term_id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = get_term( $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = get_term( $term_id, $this->taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for empty term id.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $term ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>ERROR</strong>: You must be logged in to do this!', 'wporg-forums' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check nonce.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! bbp_verify_nonce_request( 'toggle-term-subscription_' . $user_id . '_' . $term_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! bbp_verify_nonce_request( 'toggle-term-subscription_' . $user_id . '_' . $term_id . '_' . $this->taxonomy ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check current user's ability to spectate.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,9 +112,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $success = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $is_subscribed && 'wporg_bbp_unsubscribe_term' === $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::remove_user_subscription( $user_id, $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $success = self::remove_user_subscription( $user_id, $term_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false === $is_subscribed && 'wporg_bbp_subscribe_term' === $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::add_user_subscription( $user_id, $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $success = self::add_user_subscription( $user_id, $term_id );
</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"> // Success!
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +141,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> public function notify_term_subscribers_of_new_topic( $topic_id, $forum_id, $anonymous_data = false, $topic_author = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = get_the_terms( $topic_id, 'topic-tag' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = get_the_terms( $topic_id, $this->taxonomy );
</ins><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="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +174,7 @@
</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_forum_subscription_user_ids', array( $this, 'add_term_subscribers_to_forum' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bbp_forum_subscription_mail_message', array( $this, 'replace_forum_subscription_mail_message' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'bbp_forum_subscription_mail_message', array( $this, 'replace_forum_subscription_mail_message' ), 10 );
</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">@@ -206,12 +210,13 @@
</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">-You are receiving this email because you subscribed to a topic tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+%4$s
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Login and visit the topic to unsubscribe from these emails.', 'wporg-forums' ),
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $topic_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $topic_url,
+ $this->labels['receipt']
</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">@@ -229,7 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $reply_author
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function notify_term_subscribers_of_new_reply( $reply_id, $topic_id, $forum_id, $anonymous_data, $reply_author ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = get_the_terms( $topic_id, 'topic-tag' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = get_the_terms( $topic_id, $this->taxonomy );
</ins><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="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +267,7 @@
</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' ) );
</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' ), 10 );
</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">@@ -297,12 +302,13 @@
</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">-You are receiving this email because you subscribed to a topic tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+%4$s
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Login and visit the topic to unsubscribe from these emails.', 'wporg-forums' ),
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $reply_url
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $reply_url,
+ $this->labels['receipt']
</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">@@ -315,10 +321,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $taxonomy string Optional. The taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|bool Results if user has subscriptions, otherwise false
</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 get_user_taxonomy_subscriptions( $user_id = 0, $taxonomy = 'topic-tag' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_user_taxonomy_subscriptions( $user_id = 0, $taxonomy = 'topic-tag' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $user_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $user_id ) || empty( $taxonomy ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">@@ -431,31 +437,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = bbp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => get_current_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => 0,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => 'topic-tag',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subscribe' => esc_html__( 'Subscribe to this topic tag', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'unsubscribe' => esc_html__( 'Unsubscribe from this topic tag', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ), 'get_term_subscription_link' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $r['user_id'] ) || empty( $r['term_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $r['user_id'] ) || empty( $r['term_id'] ) || empty( $r['taxonomy'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = $r['user_id'];
- $term_id = $r['term_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = $r['user_id'];
+ $term_id = $r['term_id'];
+ $taxonomy = $r['taxonomy'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = get_term( $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = get_term( $term_id, $taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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"> if ( self::is_user_subscribed_to_term( $user_id, $term_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = $r['unsubscribe'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_args = array( 'action' => 'wporg_bbp_unsubscribe_term', 'term_id' => $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_args = array( 'action' => 'wporg_bbp_unsubscribe_term', 'term_id' => $term_id, 'taxonomy' => $taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = $r['subscribe'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_args = array( 'action' => 'wporg_bbp_subscribe_term', 'term_id' => $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_args = array( 'action' => 'wporg_bbp_subscribe_term', 'term_id' => $term_id, 'taxonomy' => $taxonomy );
</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"> $permalink = get_term_link( $term_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">- $url = esc_url( wp_nonce_url( add_query_arg( $query_args, $permalink ), 'toggle-term-subscription_' . $user_id . '_' . $term_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = esc_url( wp_nonce_url( add_query_arg( $query_args, $permalink ), 'toggle-term-subscription_' . $user_id . '_' . $term_id . '_' . $taxonomy ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( "<div class='wporg-bbp-term-subscription'><a href='%s'>%s</a></div>",
</span><span class="cx" style="display: block; padding: 0 10px"> $url,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $text ) );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionwporgbbptermsubscriptionphp"></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/wporg-bbp-term-subscription.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/wporg-bbp-term-subscription.php 2016-09-08 12:27:21 UTC (rev 4004)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/wporg-bbp-term-subscription.php 2016-09-08 19:14:18 UTC (rev 4005)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,9 +19,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include( dirname( __FILE__ ) . '/inc/class-plugin.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Instantiate the Plugin
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Plugin::get_instance();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+new Plugin();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Easy access for templates
</span><span class="cx" style="display: block; padding: 0 10px"> function get_subscription_link( $term_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return Plugin::get_subscription_link( array( 'term_id' => $term_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return Plugin::get_subscription_link( array(
+ 'term_id' => $term_id,
+ 'taxonomy' => 'topic-tag',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>