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_join.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/command_join.go') diff --git a/api/command_join.go b/api/command_join.go index bad176656..17deb02b7 100644 --- a/api/command_join.go +++ b/api/command_join.go @@ -34,7 +34,7 @@ func (me *JoinProvider) GetCommand(c *Context) *model.Command { } func (me *JoinProvider) DoCommand(c *Context, args *model.CommandArgs, message string) *model.CommandResponse { - if result := <-app.Srv.Store.Channel().GetByName(c.TeamId, message); result.Err != nil { + if result := <-app.Srv.Store.Channel().GetByName(c.TeamId, message, true); result.Err != nil { return &model.CommandResponse{Text: c.T("api.command_join.list.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } else { channel := result.Data.(*model.Channel) -- cgit v1.2.3-1-g7c22