summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings/user_settings_general.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-16 09:10:54 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-16 09:10:54 -0700
commit6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2 (patch)
tree5ebe7ed520eddd8e13e75a4e2ca43e3bacda1f2b /web/react/components/user_settings/user_settings_general.jsx
parentc890e21cefe135a74a4a7235b704e7af95decc5c (diff)
downloadchat-6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2.tar.gz
chat-6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2.tar.bz2
chat-6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2.zip
Inital support for multi-tab loging
Diffstat (limited to 'web/react/components/user_settings/user_settings_general.jsx')
-rw-r--r--web/react/components/user_settings/user_settings_general.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index 9c03f77a6..e6430841f 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -122,7 +122,7 @@ export default class UserSettingsGeneralTab extends React.Component {
() => {
this.updateSection('');
AsyncClient.getMe();
- const verificationEnabled = global.window.config.SendEmailNotifications === 'true' && global.window.config.RequireEmailVerification === 'true' && emailUpdated;
+ const verificationEnabled = global.window.mm_config.SendEmailNotifications === 'true' && global.window.mm_config.RequireEmailVerification === 'true' && emailUpdated;
if (verificationEnabled) {
ErrorStore.storeLastError({message: 'Check your email at ' + user.email + ' to verify the address.'});
@@ -451,8 +451,8 @@ export default class UserSettingsGeneralTab extends React.Component {
}
var emailSection;
if (this.props.activeSection === 'email') {
- const emailEnabled = global.window.config.SendEmailNotifications === 'true';
- const emailVerificationEnabled = global.window.config.RequireEmailVerification === 'true';
+ const emailEnabled = global.window.mm_config.SendEmailNotifications === 'true';
+ const emailVerificationEnabled = global.window.mm_config.RequireEmailVerification === 'true';
let helpText = 'Email is used for notifications, and requires verification if changed.';
if (!emailEnabled) {