diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-27 14:07:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 14:07:34 -0500 |
| commit | 097289f8e473c799ee752aa56e08f605110f5217 (patch) | |
| tree | 424cd42d691b28d1c08852dc02a69d69f2b70a65 /app/slackimport.go | |
| parent | 8eab04e944b3874f1fc4985344cbccec84c6002a (diff) | |
| download | chat-097289f8e473c799ee752aa56e08f605110f5217.tar.gz chat-097289f8e473c799ee752aa56e08f605110f5217.tar.bz2 chat-097289f8e473c799ee752aa56e08f605110f5217.zip | |
Merge 3.6.2 into master (#5211)
* Add webhook cache
* Add channel by name cache
* Fxing profiles in channels cache
* Fix merge
Diffstat (limited to 'app/slackimport.go')
| -rw-r--r-- | app/slackimport.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/slackimport.go b/app/slackimport.go index edeb601e2..3289f140e 100644 --- a/app/slackimport.go +++ b/app/slackimport.go @@ -472,7 +472,7 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str newChannel = SlackSanitiseChannelProperties(newChannel) var mChannel *model.Channel - if result := <-Srv.Store.Channel().GetByName(teamId, sChannel.Name); result.Err == nil { + if result := <-Srv.Store.Channel().GetByName(teamId, sChannel.Name, true); result.Err == nil { // The channel already exists as an active channel. Merge with the existing one. mChannel = result.Data.(*model.Channel) log.WriteString(utils.T("api.slackimport.slack_add_channels.merge", map[string]interface{}{"DisplayName": newChannel.DisplayName})) |