From 097289f8e473c799ee752aa56e08f605110f5217 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 27 Jan 2017 14:07:34 -0500 Subject: Merge 3.6.2 into master (#5211) * Add webhook cache * Add channel by name cache * Fxing profiles in channels cache * Fix merge --- api/command_msg.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/command_msg.go') diff --git a/api/command_msg.go b/api/command_msg.go index 86203c2cd..f7f31ed9a 100644 --- a/api/command_msg.go +++ b/api/command_msg.go @@ -64,7 +64,7 @@ func (me *msgProvider) DoCommand(c *Context, args *model.CommandArgs, message st channelName := model.GetDMNameFromIds(c.Session.UserId, userProfile.Id) targetChannelId := "" - if channel := <-app.Srv.Store.Channel().GetByName(c.TeamId, channelName); channel.Err != nil { + if channel := <-app.Srv.Store.Channel().GetByName(c.TeamId, channelName, true); channel.Err != nil { if channel.Err.Id == "store.sql_channel.get_by_name.missing.app_error" { if directChannel, err := app.CreateDirectChannel(c.Session.UserId, userProfile.Id); err != nil { c.Err = err -- cgit v1.2.3-1-g7c22