Merge branch 'master' into PLT-25

1 files changed, 1 insertions, 9 deletions

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 20ed1bf0a..03e049db0 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -35,26 +35,18 @@ var RemovedFromChannelModal = require('../components/removed_from_channel_modal.
 var FileUploadOverlay = require('../components/file_upload_overlay.jsx');
 var RegisterAppModal = require('../components/register_app_modal.jsx');
 var ImportThemeModal = require('../components/user_settings/import_theme_modal.jsx');
-var TeamStore = require('../stores/team_store.jsx');
 
 var AsyncClient = require('../utils/async_client.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
 function setupChannelPage(props) {
-    TeamStore.setCurrentId(props.TeamId);
-
     AppDispatcher.handleViewAction({
         type: ActionTypes.CLICK_CHANNEL,
         name: props.ChannelName,
         id: props.ChannelId
     });
 
-    AppDispatcher.handleViewAction({
-        type: ActionTypes.CLICK_TEAM,
-        id: props.TeamId
-    });
-
     AsyncClient.getAllPreferences();
 
     // ChannelLoader must be rendered first
@@ -237,7 +229,7 @@ function setupChannelPage(props) {
         document.getElementById('register_app_modal')
     );
 
-    if (global.window.config.SendEmailNotifications === 'false') {
+    if (global.window.mm_config.SendEmailNotifications === 'false') {
         ErrorStore.storeLastError({message: 'Preview Mode: Email notifications have not been configured'});
         ErrorStore.emitChange();
     }