Changeset 5288

Timestamp:

04/07/2017 09:25:27 PM (8 years ago)

Author:

coffee2code

Message:

Support Forums, User Badges: Use user_nicename instead of user_login when checking for user being an author or contributor.

See #2701.
Fixes #2697.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php (modified) (11 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php

@@ -74 +74 @@
      * @param int    $item_id   The ID of the item getting badge assigned.
      * @return array|false      Associative array with keys 'type', 'slug', and
-     *                          'user_login' if author merits a badge, else false.
+     *                          'user_nicename' if author merits a badge, else false.
      */
     protected function get_author_badge_info( $item_type, $item_id ) {
@@ -107 +107 @@
         $slugs = $types = array();
 
-        $user_login = get_user_by( 'id', $user_id )->user_login;
+        $user_nicename = get_user_by( 'id', $user_id )->user_nicename;
 
         // Check if the thread is associated with a plugin.
@@ -141 +141 @@
             'type'       => $type,
             'slug'       => $slugs[0],
-            'user_login' => $user_login,
+            'user_nicename' => $user_nicename,
         );
     }
@@ -195 +195 @@
         // Class related to plugin and theme authors/contributors.
         if ( $info = $this->get_author_badge_info( $item_type, $item_id ) ) {
-            if ( $this->is_user_author( $info['user_login'], $info['type'], $info['slug'] ) ) {
+            if ( $this->is_user_author( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
                 $contrib_type = 'author';
-            } elseif ( $this->is_user_contributor( $info['user_login'], $info['type'], $info['slug'] ) ) {
+            } elseif ( $this->is_user_contributor( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
                 $contrib_type = 'contributor';
             } else {
@@ -285 +285 @@
      * @param int    $item_id   The ID of the item getting badge assigned.
      * @return array|false      Associative array with keys 'type', 'slug', and
-     *                          'user_login' if author merits a badge, else null.
+     *                          'user_nicename' if author merits a badge, else null.
      */
     protected function get_author_badge( $item_type, $item_id ) {
@@ -295 +295 @@
 
         // Determine strings to use based on user being an author or contributor.
-        if ( $this->is_user_author( $info['user_login'], $info['type'], $info['slug'] ) ) {
+        if ( $this->is_user_author( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
             if ( 'plugin' == $info['type'] ) {
                 $label = __( 'Plugin Author', 'wporg-forums' );
@@ -304 +304 @@
             }
         }
-        elseif ( $this->is_user_contributor( $info['user_login'], $info['type'], $info['slug'] ) ) {
+        elseif ( $this->is_user_contributor( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
             if ( 'plugin' == $info['type'] ) {
                 $label = __( 'Plugin Contributor', 'wporg-forums' );
@@ -342 +342 @@
      * the designated author for a theme.
      *
-     * @param string $user_login User login.
+     * @param string $user_nicename User slug.
      * @param string $type       Either 'plugin' or 'theme'.
      * @param string $slug       Slug for the plugin or theme.
      * @return bool              True if user is an author, false otherwise.
      */
-    public function is_user_author( $user_login, $type, $slug ) {
+    public function is_user_author( $user_nicename, $type, $slug ) {
         if ( 'plugin' === $type ) {
             $compat = class_exists( '\WordPressdotorg\Forums\Plugin' ) ? \WordPressdotorg\Forums\Plugin::get_instance()->plugins : '';
@@ -355 +355 @@
         $authors = $compat ? $compat->get_authors( $slug ) : array();
 
-        return $authors && in_array( $user_login, $authors );
+        return $authors && in_array( $user_nicename, $authors );
     }
 
@@ -364 +364 @@
      * Currently, themes do not support having contirbutors.
      *
-     * @param string $user_login User login.
+     * @param string $user_nicename User slug.
      * @param string $type       Either 'plugin' or 'theme'.
      * @param string $slug       Slug for the plugin or theme.
      * @return bool              True if user is a contributor, false otherwise.
      */
-    public function is_user_contributor( $user_login, $type, $slug ) {
+    public function is_user_contributor( $user_nicename, $type, $slug ) {
         if ( 'plugin' === $type ) {
             $compat = class_exists( '\WordPressdotorg\Forums\Plugin' ) ? \WordPressdotorg\Forums\Plugin::get_instance()->plugins : '';
@@ -377 +377 @@
         $contributors = $compat ? $compat->get_contributors( $slug ) : array();
 
-        return $contributors && in_array( $user_login, $contributors );
+        return $contributors && in_array( $user_nicename, $contributors );
     }