summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings_general.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-06-05 02:37:19 -0400
committerenahum <nahumhbl@gmail.com>2016-06-05 03:37:19 -0300
commit9133d5939c8196f6f6ed4ad6b94610572a7beb85 (patch)
tree9b38c10660045295d46d03abd4ae43f877f1f761 /webapp/components/user_settings/user_settings_general.jsx
parente71c43d24ae3207ac18357b67a020d3def675f55 (diff)
downloadchat-9133d5939c8196f6f6ed4ad6b94610572a7beb85.tar.gz
chat-9133d5939c8196f6f6ed4ad6b94610572a7beb85.tar.bz2
chat-9133d5939c8196f6f6ed4ad6b94610572a7beb85.zip
Fixing nickname when LDAP is enabled but nickname field not set (#3243)
Diffstat (limited to 'webapp/components/user_settings/user_settings_general.jsx')
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index da195d0be..bd1e2829d 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -649,7 +649,7 @@ class UserSettingsGeneralTab extends React.Component {
if (this.props.activeSection === 'nickname') {
let extraInfo;
let submit = null;
- if (this.props.user.auth_service === 'ldap' && global.window.mm_config.NicknameAttributeSet) {
+ if (this.props.user.auth_service === 'ldap' && global.window.mm_config.NicknameAttributeSet === 'true') {
extraInfo = (
<span>
<FormattedMessage