diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-26 12:10:10 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-26 12:10:10 -0700 |
| commit | 86e3764cbd544c64136d5c34c2b80fb66a0cd4bd (patch) | |
| tree | 60b7314ee05b996c60160e490c1dfcc73dc1d8fc /web/react/components/user_settings | |
| parent | 2680b81568ca3f8eac1d5937f85085f1785eb84d (diff) | |
| parent | 9635bfdd4f3925b0f6f0873508216824b604ac10 (diff) | |
| download | chat-86e3764cbd544c64136d5c34c2b80fb66a0cd4bd.tar.gz chat-86e3764cbd544c64136d5c34c2b80fb66a0cd4bd.tar.bz2 chat-86e3764cbd544c64136d5c34c2b80fb66a0cd4bd.zip | |
Merge pull request #1193 from hmhealey/plt798
PLT-798 Prevent image files larger than 4k resolution from being uploaded
Diffstat (limited to 'web/react/components/user_settings')
| -rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index 70e559c30..1c8ce3c79 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -171,7 +171,7 @@ export default class UserSettingsGeneralTab extends React.Component { }.bind(this), function imageUploadFailure(err) { var state = this.setupInitialState(this.props); - state.serverError = err; + state.serverError = err.message; this.setState(state); }.bind(this) ); |