<!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>[4289] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php: Support Forums: Use the user object for view queries.</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/4289">4289</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/4289","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-10-23 18:12:42 +0000 (Sun, 23 Oct 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: Use the user object for view queries.
Allows empty forums for non-contributing users, and 404s for non-existent users.
Abstracts some logic to make adding a plugin-contributors view easier.
See <a href="http://meta.trac.wordpress.org/ticket/2071">#2071</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>
</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 2016-10-22 19:24:31 UTC (rev 4288)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php 2016-10-23 18:12:42 UTC (rev 4289)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var $loaded = false;
</span><span class="cx" style="display: block; padding: 0 10px"> var $query = null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $user_login = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $user = null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->loaded ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,14 +37,28 @@
</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">+ /**
+ * Check the request for the `wporg_user_login`, and then add filters to
+ * handle either the feed request or the custom view if a user is found.
+ *
+ * @param array $query_vars The query vars
+ * @return array The query vars
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function request( $query_vars ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $query_vars['feed'] ) && isset( $query_vars['wporg_user_login'] ) ) {
- if ( isset( $query_vars['bbp_view'] ) && in_array( $query_vars['bbp_view'], array( 'plugin-committer' ) ) ) {
- $this->query = $query_vars;
- add_filter( 'bbp_get_view_query_args', array( $this, 'get_view_query_args_for_feed' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $query_vars['wporg_user_login'] ) && ! empty( $query_vars['wporg_user_login'] ) && ! $this->user ) {
+ $user = get_user_by( 'slug', $query_vars['wporg_user_login'] );
+ if ( $user ) {
+ // Set the user if available for custom views.
+ $this->user = $user;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Override bbPress topic pubDate handling to show topic time and not last active time
- add_filter( 'get_post_metadata', array( $this, 'topic_pubdate_correction_for_feed' ), 10, 4 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If this is a feed, add filters to handle the custom view.
+ if ( isset( $query_vars['feed'] ) && isset( $query_vars['bbp_view'] ) && in_array( $query_vars['bbp_view'], array( 'plugin-committer' ) ) ) {
+ $this->query = $query_vars;
+ add_filter( 'bbp_get_view_query_args', array( $this, 'get_view_query_args_for_feed' ), 10, 2 );
+
+ // Override bbPress topic pubDate handling to show topic time and not last active time.
+ add_filter( 'get_post_metadata', array( $this, 'topic_pubdate_correction_for_feed' ), 10, 4 );
+ }
</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 $query_vars;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_query' => array( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'topic-plugin',
</span><span class="cx" style="display: block; padding: 0 10px"> 'field' => 'slug',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'terms' => $this->get_plugin_slugs_by_committer( $this->query['wporg_user_login'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'terms' => self::get_plugin_slugs_by_committer( $this->user->user_login ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_stickies' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,24 +90,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</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">- public function parse_query() {
- $user_login = get_query_var( 'wporg_user_login' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Determine if a custom view needs to be loaded for this query and register
+ * the view if needed.
+ *
+ * @param array $query_vars The query vars
+ */
+ public function parse_query( $query_vars ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $view = get_query_var( 'bbp_view' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $user_login || ! $view ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $view || ! $this->user ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Basic setup.
- $this->user_login = $user_login;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $view == 'plugin-committer' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = $this->get_plugin_slugs_by_committer( $user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slugs = self::get_plugin_slugs_by_committer( $this->user->user_login );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add plugin-committer view.
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_register_view(
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin-committer',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Plugin Committer » %s', 'wporg-forums' ), esc_html( $user_login ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Plugin Committer » %s', 'wporg-forums' ), esc_html( $this->user->user_login ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent__in' => array( Plugin::PLUGINS_FORUM_ID, Plugin::REVIEWS_FORUM_ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,14 +167,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Pretty permalinks.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_rewrite->using_permalinks() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $wp_rewrite->root . 'view/plugin-committer/' . $this->user_login;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = $wp_rewrite->root . "view/{$view}/" . $this->user->user_login;
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = home_url( user_trailingslashit( $url ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Unpretty permalinks.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( array(
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_get_view_rewrite_id() => $view,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wporg_user_login' => $this->user_login,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wporg_user_login' => $this->user->user_login,
</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 $url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,6 +287,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_plugin_slugs_by_committer( $user_login ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs = (array) $wpdb->get_col( $wpdb->prepare( "SELECT `path` FROM `" . PLUGINS_TABLE_PREFIX . "svn_access` WHERE `user` = %s AND `access` = 'rw'", $user_login ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $slugs;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return self::clean_slugs( $slugs );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public static function clean_slugs( $slugs ) {
+ $cleanslugs = array();
+ foreach ( $slugs as $slug ) {
+ $slug = trim( $slug, '/' );
+ if ( ! empty( $slug ) ) {
+ $cleanslugs[] = $slug;
+ }
+ }
+ return $cleanslugs;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>