<!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>[5288] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php: Support Forums, User Badges: Use `user_nicename` instead of `user_login` when checking for user being an author or contributor.</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/5288">5288</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/5288","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-07 21:25:27 +0000 (Fri, 07 Apr 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, User Badges: Use `user_nicename` instead of `user_login` when checking for user being an author or contributor.
See <a href="http://meta.trac.wordpress.org/ticket/2701">#2701</a>.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2697">#2697</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpuserbadgesincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpuserbadgesincclasspluginphp"></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-user-badges/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-user-badges/inc/class-plugin.php 2017-04-07 21:19:44 UTC (rev 5287)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php 2017-04-07 21:25:27 UTC (rev 5288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * for badge info. One of 'topic' or 'reply'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $item_id The ID of the item getting badge assigned.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|false Associative array with keys 'type', 'slug', and
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'user_login' if author merits a badge, else false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'user_nicename' if author merits a badge, else false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_author_badge_info( $item_type, $item_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( '\WordPressdotorg\Forums\Plugin' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs = $types = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_login = get_user_by( 'id', $user_id )->user_login;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_nicename = get_user_by( 'id', $user_id )->user_nicename;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the thread is associated with a plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $forum_id === \WordPressdotorg\Forums\Plugin::PLUGINS_FORUM_ID ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => $type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $slugs[0],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_login' => $user_login,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_nicename' => $user_nicename,
</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">@@ -194,9 +194,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Class related to plugin and theme authors/contributors.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $info = $this->get_author_badge_info( $item_type, $item_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->is_user_author( $info['user_login'], $info['type'], $info['slug'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_user_author( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contrib_type = 'author';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $this->is_user_contributor( $info['user_login'], $info['type'], $info['slug'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $this->is_user_contributor( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contrib_type = 'contributor';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $contrib_type = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'topic' or 'reply'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $item_id The ID of the item getting badge assigned.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|false Associative array with keys 'type', 'slug', and
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'user_login' if author merits a badge, else null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'user_nicename' if author merits a badge, else null.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_author_badge( $item_type, $item_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $info = $this->get_author_badge_info( $item_type, $item_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $label = $help = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Determine strings to use based on user being an author or contributor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->is_user_author( $info['user_login'], $info['type'], $info['slug'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_user_author( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugin' == $info['type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $label = __( 'Plugin Author', 'wporg-forums' );
</span><span class="cx" style="display: block; padding: 0 10px"> $help = __( 'This person is the author of this plugin', 'wporg-forums' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +303,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $help = __( 'This person is the author of this theme', 'wporg-forums' );
</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">- elseif ( $this->is_user_contributor( $info['user_login'], $info['type'], $info['slug'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( $this->is_user_contributor( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugin' == $info['type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $label = __( 'Plugin Contributor', 'wporg-forums' );
</span><span class="cx" style="display: block; padding: 0 10px"> $help = __( 'This person is a contributor to this plugin', 'wporg-forums' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,12 +341,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * An author is defined as someone who has commit access to a plugin, or is
</span><span class="cx" style="display: block; padding: 0 10px"> * the designated author for a theme.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $user_login User login.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $user_nicename User slug.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $type Either 'plugin' or 'theme'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $slug Slug for the plugin or theme.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if user is an author, false otherwise.
</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 is_user_author( $user_login, $type, $slug ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function is_user_author( $user_nicename, $type, $slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugin' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $compat = class_exists( '\WordPressdotorg\Forums\Plugin' ) ? \WordPressdotorg\Forums\Plugin::get_instance()->plugins : '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $authors = $compat ? $compat->get_authors( $slug ) : array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $authors && in_array( $user_login, $authors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $authors && in_array( $user_nicename, $authors );
</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">@@ -363,12 +363,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * A plugin contributor is someone listed as a contributor in the plugin's readme.txt.
</span><span class="cx" style="display: block; padding: 0 10px"> * Currently, themes do not support having contirbutors.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $user_login User login.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $user_nicename User slug.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $type Either 'plugin' or 'theme'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $slug Slug for the plugin or theme.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if user is a contributor, false otherwise.
</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 is_user_contributor( $user_login, $type, $slug ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function is_user_contributor( $user_nicename, $type, $slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'plugin' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $compat = class_exists( '\WordPressdotorg\Forums\Plugin' ) ? \WordPressdotorg\Forums\Plugin::get_instance()->plugins : '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $contributors = $compat ? $compat->get_contributors( $slug ) : array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $contributors && in_array( $user_login, $contributors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $contributors && in_array( $user_nicename, $contributors );
</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>