<!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>[10673] sites/trunk/wordpress.org/public_html/wp-content/plugins: Support Forums: Move the "Subscribe to this plugin/theme" button to the sidebar instead of before the main topic listing.</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/10673">10673</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/10673","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>2021-02-15 04:03:50 +0000 (Mon, 15 Feb 2021)</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: Move the "Subscribe to this plugin/theme" button to the sidebar instead of before the main topic listing.
This also adds a javascript-based confirm "are you sure?" confirmation upon attempting to subscribe to the plugin/theme.
See <a href="http://meta.trac.wordpress.org/ticket/3456">#3456</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassdirectorycompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-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_htmlwpcontentpluginssupportforumsincclassdirectorycompatphp"></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-directory-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-directory-compat.php 2021-02-12 10:11:10 UTC (rev 10672)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php 2021-02-15 04:03:50 UTC (rev 10673)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,8 +285,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add plugin- and theme-specific filters and actions.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_compat_view_sidebar', array( $this, 'do_view_sidebar' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wporg_compat_view_sidebar', array( $this, 'do_subscription_link' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_compat_before_single_view', array( $this, 'do_view_header' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wporg_compat_before_single_view', array( $this, 'do_subscription_link' ), 11 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add output filters and actions.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_get_view_link', array( $this, 'get_view_link' ), 10, 2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,9 +750,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugin' == $this->compat() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subscribe = esc_html__( 'Subscribe to this plugin', 'wporg-forums' );
</span><span class="cx" style="display: block; padding: 0 10px"> $unsubscribe = esc_html__( 'Unsubscribe from this plugin', 'wporg-forums' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $js_confirm = esc_html__( 'Are you sure you wish to subscribe by email to all future topics created in this plugin forum?', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $subscribe = esc_html__( 'Subscribe to this theme', 'wporg-forums' );
</span><span class="cx" style="display: block; padding: 0 10px"> $unsubscribe = esc_html__( 'Unsubscribe from this theme', 'wporg-forums' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $js_confirm = esc_html__( 'Are you sure you wish to subscribe by email to all future topics created in this theme forum?', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $term_subscription = Term_Subscription\Plugin::get_subscription_link( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => $this->term->term_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -759,6 +761,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $this->taxonomy(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'subscribe' => $subscribe,
</span><span class="cx" style="display: block; padding: 0 10px"> 'unsubscribe' => $unsubscribe,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'js_confirm' => $js_confirm,
</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></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 2021-02-12 10:11:10 UTC (rev 10672)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2021-02-15 04:03:50 UTC (rev 10673)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,8 +583,10 @@
</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><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'topic-tag',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'class' => 'button',
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'js_confirm' => esc_html__( 'Are you sure you wish to subscribe by email to all future topics created in this tag?', 'wporg-forums' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ), 'get_term_subscription_link' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $r['user_id'] ) || empty( $r['term_id'] ) || empty( $r['taxonomy'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,13 +597,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = $r['taxonomy'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = self::get_subscription_url( $r['user_id'], $r['term_id'], $r['taxonomy'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = $r['subscribe'];
</del><span class="cx" style="display: block; padding: 0 10px"> if ( self::is_user_subscribed_to_term( $r['user_id'], $r['term_id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = $r['unsubscribe'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $text = $r['unsubscribe'];
+ $js_confirm = '';
+ } else {
+ $text = $r['subscribe'];
+ $js_confirm = 'javascript:return confirm(' . json_encode( $r['js_confirm'] ) . ');';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return sprintf( "<div class='wporg-bbp-term-subscription'><a href='%s'>%s</a></div>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return sprintf(
+ "<div class='wporg-bbp-term-subscription'><a href='%s' class='%s' onclick='%s'>%s</a></div>",
</ins><span class="cx" style="display: block; padding: 0 10px"> $url,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html( $text ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( $r['class'] ),
+ esc_attr( $js_confirm ),
+ esc_html( $text )
+ );
</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"> public static function get_valid_actions() {
</span></span></pre>
</div>
</div>
</body>
</html>