<!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>[12410] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc: Support Forums: Setup the Directory_Compat classes in the context of the topic when processing email subscriptions for pending/delayed topics.</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/12410">12410</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/12410","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>2023-02-21 05:48:06 +0000 (Tue, 21 Feb 2023)</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: Setup the Directory_Compat classes in the context of the topic when processing email subscriptions for pending/delayed topics.
See <a href="http://meta.trac.wordpress.org/ticket/6786">#6786</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_htmlwpcontentpluginssupportforumsincclassemailsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-emails.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassplugindirectorycompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin-directory-compat.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassthemedirectorycompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-theme-directory-compat.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 2023-02-20 19:13:06 UTC (rev 12409)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php 2023-02-21 05:48:06 UTC (rev 12410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,6 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> abstract protected function taxonomy();
</span><span class="cx" style="display: block; padding: 0 10px"> abstract protected function name();
</span><span class="cx" style="display: block; padding: 0 10px"> abstract protected function parse_query();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ abstract protected function for_slug( $slug );
</ins><span class="cx" style="display: block; padding: 0 10px"> abstract protected function do_view_sidebar();
</span><span class="cx" style="display: block; padding: 0 10px"> abstract protected function do_topic_sidebar();
</span><span class="cx" style="display: block; padding: 0 10px"> abstract protected function do_view_header();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,6 +71,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">+ * Maybe load the data for this compat directory class.
+ *
+ * @param int $topic_id The topic ID that we should initialize in the context of.
+ */
+ public function init_for_topic( $topic_id ) {
+ $forum_id = bbp_get_topic_forum_id( $topic_id );
+ if ( $forum_id != $this->forum_id() ) {
+ return;
+ }
+
+ $terms = get_the_terms( $topic_id, $this->taxonomy() );
+ if ( ! $terms ) {
+ return;
+ }
+
+ $this->for_slug( $terms[0]->slug );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Handle view feeds for this compat.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function request( $query_vars ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -827,7 +847,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_term( $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Note: Not using $this->title() here so as to filter other terms of this taxonomy correctly.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term->name = $this->get_object( $term->slug )->post_title ?? $term->name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_admin() ) {
+ $term->name = $this->get_object( $term->slug )->post_title ?? $term->name;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $term;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassemailsphp"></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-emails.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-emails.php 2023-02-20 19:13:06 UTC (rev 12409)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-emails.php 2023-02-21 05:48:06 UTC (rev 12410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,6 +168,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $forum_id = bbp_get_topic_forum_id( $topic_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $topic_author = bbp_get_topic_author_id( $topic_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Setup the forum compat classes, as used by email filters for subject changes.
+ $forums = Plugin::get_instance();
+ if ( $forums->plugins ) {
+ $forums->plugins->init_for_topic( $topic_id );
+ $forums->themes->init_for_topic( $topic_id );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // For performance reasons, we've removed the bbPress bbp_update_topic() method, and replaced it with our slightly altered variant.
</span><span class="cx" style="display: block; padding: 0 10px"> $bbp_update_topic = [ Plugin::get_instance()->dropin, 'bbp_update_topic' ];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! has_filter( 'bbp_new_topic', $bbp_update_topic ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,6 +209,13 @@
</span><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">+ // Setup the forum compat classes, as used by email filters for subject changes.
+ $forums = Plugin::get_instance();
+ if ( $forums->plugins ) {
+ $forums->plugins->init_for_topic( $topic_id );
+ $forums->themes->init_for_topic( $topic_id );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // For performance reasons, we've removed the bbPress bbp_update_reply() method, and replaced it with our slightly altered variant.
</span><span class="cx" style="display: block; padding: 0 10px"> $bbp_update_reply = [ Plugin::get_instance()->dropin, 'bbp_update_reply' ];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! has_filter( 'bbp_new_reply', $bbp_update_reply ) ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassplugindirectorycompatphp"></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-plugin-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-plugin-directory-compat.php 2023-02-20 19:13:06 UTC (rev 12409)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin-directory-compat.php 2023-02-21 05:48:06 UTC (rev 12410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,10 +90,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</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->for_slug( $slug ) ) {
+ status_header( 404 );
+ }
+ }
+
+ /**
+ * Set the directory instance to the slugs data.
+ *
+ * @param string $slug The plugin slug.
+ */
+ public function for_slug( $slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin = $this->get_object( $slug );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $plugin ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- status_header( 404 );
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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"> $this->slug = $plugin->post_name;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassthemedirectorycompatphp"></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-theme-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-theme-directory-compat.php 2023-02-20 19:13:06 UTC (rev 12409)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-theme-directory-compat.php 2023-02-21 05:48:06 UTC (rev 12410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,10 +90,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</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->for_slug( $slug ) ) {
+ status_header( 404 );
+ }
+ }
+
+ /**
+ * Set the directory instance to the slugs data.
+ *
+ * @param string $slug The theme slug.
+ */
+ public function for_slug( $slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = $this->get_object( $slug );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $theme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- status_header( 404 );
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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"> $this->slug = $theme->post_name;
</span></span></pre>
</div>
</div>
</body>
</html>