diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
| commit | bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1 (patch) | |
| tree | 1626d089802a92ee208b6e7fa056378e40568a92 /web/react/components/user_settings | |
| parent | 581785f5044eecdc7cf664e4c7fc59efc6babc96 (diff) | |
| parent | 9bba6c79882d1f5d14b98052caf59a11fc2388d5 (diff) | |
| download | chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.gz chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.bz2 chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.zip | |
Merge branch 'master' into PLT-1429
Diffstat (limited to 'web/react/components/user_settings')
| -rw-r--r-- | web/react/components/user_settings/user_settings_security.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx index 0c9e722de..5693047c2 100644 --- a/web/react/components/user_settings/user_settings_security.jsx +++ b/web/react/components/user_settings/user_settings_security.jsx @@ -88,7 +88,8 @@ class SecurityTab extends React.Component { } if (newPassword !== confirmPassword) { - this.setState({passwordError: formatMessage(holders.passwordMatchError), serverError: ''}); + var defaultState = Object.assign(this.getDefaultState(), {passwordError: formatMessage(holders.passwordMatchError), serverError: ''}); + this.setState(defaultState); return; } |