<!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>[8213] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php: Support Forum: Override `WP::handle_404()` for Theme/Plugin/Review forum views when a matching plugin/theme is found.</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/8213">8213</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/8213","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-02-07 06:59:25 +0000 (Thu, 07 Feb 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 Forum: Override `WP::handle_404()` for Theme/Plugin/Review forum views when a matching plugin/theme is found.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4072">#4072</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>
</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 2019-02-06 19:57:21 UTC (rev 8212)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php 2019-02-07 06:59:25 UTC (rev 8213)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,6 +58,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove new topic form at the bottom of reviews forum.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_get_template_part', array( $this, 'noop_reviews_forum_form_topic' ), 10, 3 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Tell WordPress not to 404 (before bbPress overrides it) so that Canonical can do it's job.
+ add_filter( 'pre_handle_404', array( $this, 'abort_wp_handle_404' ) );
</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,9 +396,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ( ! empty( $this->authors ) && in_array( $user->user_nicename, $this->authors ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ||
</span><span class="cx" style="display: block; padding: 0 10px"> ( ! empty( $this->contributors ) && in_array( $user->user_nicename, $this->contributors ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ||
</ins><span class="cx" style="display: block; padding: 0 10px"> ( ! empty( $this->support_reps ) && in_array( $user->user_nicename, $this->support_reps ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ||
</ins><span class="cx" style="display: block; padding: 0 10px"> // Back-compat for support reps added before https://meta.trac.wordpress.org/changeset/5867,
</span><span class="cx" style="display: block; padding: 0 10px"> // can be removed once they are re-added via the Plugin Directory UI.
</span><span class="cx" style="display: block; padding: 0 10px"> ( is_a( $user, 'WP_User' ) && $user->supportrep == $this->slug() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -704,6 +707,19 @@
</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">+ * Filter WP::handle_404() to not run on compat views, so as to allow Canonical to properly handle the request.
+ */
+ public function abort_wp_handle_404( $handled ) {
+ if ( $this->slug() ) {
+ // We've matched a term, so WordPress shouldn't 404 this request.
+ $handled = true;
+ }
+
+ return $handled;
+ }
+
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Add a subscribe/unsubscribe link to the compat views.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function do_subscription_link() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -898,7 +914,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT slug
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$prefix}terms AS t
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LEFT JOIN {$prefix}term_relationships AS tr 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_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE tt.taxonomy = 'plugin_committers' AND tr.object_id = %d",
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin->ID
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -933,7 +949,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT slug
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$prefix}terms AS t
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LEFT JOIN {$prefix}term_relationships AS tr 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_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE tt.taxonomy = 'plugin_contributors' AND tr.object_id = %d",
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin->ID
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -967,7 +983,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT slug
</span><span class="cx" style="display: block; padding: 0 10px"> FROM {$prefix}terms AS t
</span><span class="cx" style="display: block; padding: 0 10px"> LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LEFT JOIN {$prefix}term_relationships AS tr 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_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE tt.taxonomy = 'plugin_support_reps' AND tr.object_id = %d",
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin->ID
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre>
</div>
</div>
</body>
</html>