Changeset 8879

Timestamp:

05/27/2019 04:40:02 AM (6 years ago)

Author:

dd32

Message:

WP I18N Teams: Respect the display_name field when set for slack user data.

See [8878].
Fixes #4464.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/wp-i18n-teams.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wp-i18n-teams/wp-i18n-teams.php

@@ -583 +583 @@
         $data = $wpdb->get_var( $wpdb->prepare( "SELECT profiledata FROM slack_users WHERE user_id = %d", $user_id ) );
         if ( $data && ( $data = json_decode( $data, true ) ) ) {
-            // Optional Display Name field
             if ( !empty( $data['profile']['display_name'] ) && empty( $data['deleted'] ) ) {
+                // Optional Display Name field.
                 $slack_username = $data['profile']['display_name'];
-            }
-
-            // Fall back to "Full Name" field.
-            if ( !empty( $data['profile']['real_name'] ) && empty( $data['deleted'] ) ) {
+            } elseif ( !empty( $data['profile']['real_name'] ) && empty( $data['deleted'] ) ) {
+                // Fall back to "Full Name" field.
                 $slack_username = $data['profile']['real_name'];
             }