diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-07-20 17:33:23 -0400 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-07-20 17:33:23 -0400 |
| commit | 022cb7ffa1517e7ac59a1a42e62a37b19db9f646 (patch) | |
| tree | f1ee2234df0fdd43793d728a7120f16236360fe7 /webapp/components | |
| parent | 2bf81a9f092f03d87f492bdf50699ac90c231826 (diff) | |
| download | chat-022cb7ffa1517e7ac59a1a42e62a37b19db9f646.tar.gz chat-022cb7ffa1517e7ac59a1a42e62a37b19db9f646.tar.bz2 chat-022cb7ffa1517e7ac59a1a42e62a37b19db9f646.zip | |
If user tries to change email to current email, do nothing (#3643)
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 2 |
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 2a411a607..8dce4deed 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -167,7 +167,7 @@ class UserSettingsGeneralTab extends React.Component { const {formatMessage} = this.props.intl; - if (user.email === email && confirmEmail === '') { + if (email === user.email && (confirmEmail === '' || confirmEmail === user.email)) { this.updateSection(''); return; } |