diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-08-24 11:36:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 11:36:39 +0200 |
| commit | 5876b52ecd0b434dc8fcc0f278c3ce7dcae30d06 (patch) | |
| tree | 8fa91548eb37ffa3370fb80160e971bb46d6775a /app/channel.go | |
| parent | bba3bbd9f3e250cca0ce705e664382fe3ad6e78a (diff) | |
| parent | d2945cdd77bdf1ee03367a0d45624094fb936c19 (diff) | |
| download | chat-5876b52ecd0b434dc8fcc0f278c3ce7dcae30d06.tar.gz chat-5876b52ecd0b434dc8fcc0f278c3ce7dcae30d06.tar.bz2 chat-5876b52ecd0b434dc8fcc0f278c3ce7dcae30d06.zip | |
Merge release-5.2
Diffstat (limited to 'app/channel.go')
| -rw-r--r-- | app/channel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/channel.go b/app/channel.go index 4dcab83ee..535eff724 100644 --- a/app/channel.go +++ b/app/channel.go @@ -1498,7 +1498,7 @@ func (a *App) UpdateChannelLastViewedAt(channelIds []string, userId string) *mod } func (a *App) AutocompleteChannels(teamId string, term string) (*model.ChannelList, *model.AppError) { - includeDeleted := *a.Config().TeamSettings.ViewArchivedChannels + includeDeleted := *a.Config().TeamSettings.ExperimentalViewArchivedChannels if result := <-a.Srv.Store.Channel().AutocompleteInTeam(teamId, term, includeDeleted); result.Err != nil { return nil, result.Err @@ -1508,7 +1508,7 @@ func (a *App) AutocompleteChannels(teamId string, term string) (*model.ChannelLi } func (a *App) SearchChannels(teamId string, term string) (*model.ChannelList, *model.AppError) { - includeDeleted := *a.Config().TeamSettings.ViewArchivedChannels + includeDeleted := *a.Config().TeamSettings.ExperimentalViewArchivedChannels if result := <-a.Srv.Store.Channel().SearchInTeam(teamId, term, includeDeleted); result.Err != nil { return nil, result.Err |