<!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>[5868] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc: Support Forums: Introduce `Directory_Compat::get_support_reps()` method to retrieve users assigned as the plugin/theme support reps.</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/5868">5868</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/5868","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-03 21:46:04 +0000 (Sun, 03 Sep 2017)</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: Introduce `Directory_Compat::get_support_reps()` method to retrieve users assigned as the plugin/theme support reps.
See <a href="http://meta.trac.wordpress.org/ticket/2699">#2699</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_htmlwpcontentpluginssupportforumsincclassplugindirectorycompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin-directory-compat.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassstickiescompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-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 2017-09-03 21:43:53 UTC (rev 5867)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php 2017-09-03 21:46:04 UTC (rev 5868)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var $loaded = false;
</span><span class="cx" style="display: block; padding: 0 10px"> var $authors = null;
</span><span class="cx" style="display: block; padding: 0 10px"> var $contributors = null;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $support_reps = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> var $query = null;
</span><span class="cx" style="display: block; padding: 0 10px"> var $term = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,6 +317,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->{$this->compat()} = $this->get_object( $slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->authors = $this->get_authors( $slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->contributors = $this->get_contributors( $slug );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->support_reps = $this->get_support_reps( $slug );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->term = $terms[0];
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Instantiate WPORG_Stickies mode for topic view.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( 'WordPressdotorg\Forums\Stickies_Compat' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->stickies = new Stickies_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ), $this->term, $this->authors, $this->contributors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->stickies = new Stickies_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ), $this->term, $this->authors, $this->contributors, $this->support_reps );
</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->loaded = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +342,8 @@
</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">- * Allow plugin/theme authors and contributors to resolve a topic on their support forum.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allow plugin/theme authors, contributors, and support reps to resolve a topic
+ * on their support forum.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $retval If the user can set a topic resolution for the topic
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id The user id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,6 +360,10 @@
</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><span class="cx" style="display: block; padding: 0 10px"> ||
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( ! empty( $this->support_reps ) && in_array( $user->user_nicename, $this->support_reps ) )
+ ||
+ // Back-compat for support reps added before https://meta.trac.wordpress.org/changeset/5867,
+ // can be removed once they are re-added via the Plugin Directory UI.
</ins><span class="cx" style="display: block; padding: 0 10px"> ( is_a( $user, 'WP_User' ) && $user->supportrep == $this->slug() )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -901,4 +908,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $contributors;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function get_support_reps( $slug ) {
+ global $wpdb;
+
+ if ( null !== $this->support_reps ) {
+ return $this->support_reps;
+ }
+
+ // Themes do not have support reps right now.
+ if ( $this->compat() == 'theme' ) {
+ $support_reps = array();
+ return $support_reps;
+ }
+
+ // Check the cache.
+ $cache_key = $slug;
+ $cache_group = $this->compat() . '-support-reps-slugs';
+ $support_reps = wp_cache_get( $cache_key, $cache_group );
+ if ( ! $support_reps ) {
+ $plugin = $this->get_object( $slug );
+ $prefix = $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_';
+ $support_reps = $wpdb->get_col( $wpdb->prepare(
+ "SELECT slug
+ FROM {$prefix}terms AS t
+ LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
+ LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id
+ WHERE tt.taxonomy = 'plugin_support_reps' AND tr.object_id = %d",
+ $plugin->ID
+ ) );
+
+ wp_cache_set( $cache_key, $support_reps, $cache_group, HOUR_IN_SECONDS );
+ }
+ return $support_reps;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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 2017-09-03 21:43:53 UTC (rev 5867)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin-directory-compat.php 2017-09-03 21:46:04 UTC (rev 5868)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->plugin = $plugin;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->authors = $this->get_authors( $slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->contributors = $this->get_contributors( $slug );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->support_reps = $this->get_support_reps( $slug );
</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_htmlwpcontentpluginssupportforumsincclassstickiescompatphp"></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-stickies-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-stickies-compat.php 2017-09-03 21:43:53 UTC (rev 5867)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-compat.php 2017-09-03 21:46:04 UTC (rev 5868)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var $object = null;
</span><span class="cx" style="display: block; padding: 0 10px"> var $term = null;
</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 __construct( $compat, $slug, $taxonomy, $object, $term, $authors = array(), $contributors = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $compat, $slug, $taxonomy, $object, $term, $authors = array(), $contributors = array(), $support_reps = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $compat ) || empty( $slug ) || empty( $taxonomy ) || empty( $object ) || empty( $term ) ) {
</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">@@ -24,6 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->term = $term;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->authors = $authors;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->contributors = $contributors;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->support_reps = $support_reps;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove global stickies from sticky array.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_get_super_stickies', array( $this, 'get_super_stickies' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,6 +248,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->contributors && in_array( $user->user_nicename, $this->contributors ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Compat support reps.
+ if ( $this->support_reps && in_array( $user->user_nicename, $this->support_reps ) ) {
+ $retval = true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2017-09-03 21:43:53 UTC (rev 5867)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-theme-directory-compat.php 2017-09-03 21:46:04 UTC (rev 5868)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme = $theme;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->authors = $this->get_authors( $slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->contributors = $this->get_contributors( $slug );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->support_reps = $this->get_support_reps( $slug );
</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>
</div>
</body>
</html>