diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-16 12:52:50 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-16 12:52:50 -0400 |
commit | 7e418714bce067172e527359f391943459b3bd48 (patch) | |
tree | fb06d542eddb5ce8d63fce27bfe87f6c9c63adbb /web/react/components/user_settings_general.jsx | |
parent | 9828d84f01147ffb87b372d20681f91325ecfcf0 (diff) | |
parent | 4e3896d7b1911b8c184dee3c650461f0d3c0acea (diff) | |
download | chat-7e418714bce067172e527359f391943459b3bd48.tar.gz chat-7e418714bce067172e527359f391943459b3bd48.tar.bz2 chat-7e418714bce067172e527359f391943459b3bd48.zip |
Merge pull request #687 from mattermost/PLT-93
PLT-93 Cleaning up client side configs
Diffstat (limited to 'web/react/components/user_settings_general.jsx')
-rw-r--r-- | web/react/components/user_settings_general.jsx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/web/react/components/user_settings_general.jsx b/web/react/components/user_settings_general.jsx index dd0abc8a5..66cde6ca2 100644 --- a/web/react/components/user_settings_general.jsx +++ b/web/react/components/user_settings_general.jsx @@ -2,7 +2,6 @@ // See License.txt for license information. var UserStore = require('../stores/user_store.jsx'); -var ConfigStore = require('../stores/config_store.jsx'); var SettingItemMin = require('./setting_item_min.jsx'); var SettingItemMax = require('./setting_item_max.jsx'); var SettingPicture = require('./setting_picture.jsx'); @@ -209,7 +208,7 @@ export default class UserSettingsGeneralTab extends React.Component { } setupInitialState(props) { var user = props.user; - var emailEnabled = !ConfigStore.getSettingAsBoolean('ByPassEmail', false); + var emailEnabled = !global.window.config.ByPassEmail; return {username: user.username, firstName: user.first_name, lastName: user.last_name, nickname: user.nickname, email: user.email, picture: null, loadingPicture: false, emailEnabled: emailEnabled}; } |