diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
| commit | 92d8fa4aa8af170d0018baed94a8787d06297e44 (patch) | |
| tree | dc5000a3584952c797c03bf4331282a5e1536848 /webapp/routes | |
| parent | 742bab6429aeb1b581275da3c06af99fe293baab (diff) | |
| parent | 30974533941e73f102505d07badf538cfdbbf3fc (diff) | |
| download | chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.gz chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.bz2 chat-92d8fa4aa8af170d0018baed94a8787d06297e44.zip | |
Merge branch 'release-3.8'
Diffstat (limited to 'webapp/routes')
| -rw-r--r-- | webapp/routes/route_team.jsx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx index 405762e0c..e8ef3f410 100644 --- a/webapp/routes/route_team.jsx +++ b/webapp/routes/route_team.jsx @@ -13,7 +13,6 @@ import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; import Constants from 'utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; import * as AsyncClient from 'utils/async_client.jsx'; -import * as Utils from 'utils/utils.jsx'; import Client from 'client/web_client.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import BrowserStore from 'stores/browser_store.jsx'; @@ -35,7 +34,7 @@ function doChannelChange(state, replace, callback) { channel = ChannelStore.getByName(state.params.channel); if (channel && channel.type === Constants.DM_CHANNEL) { - loadNewDMIfNeeded(Utils.getUserIdFromChannelName(channel)); + loadNewDMIfNeeded(channel.id); } else if (channel && channel.type === Constants.GM_CHANNEL) { loadNewGMIfNeeded(channel.id); } |