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/post.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/post.go')
| -rw-r--r-- | app/post.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/post.go b/app/post.go index d4649d64c..0eed87280 100644 --- a/app/post.go +++ b/app/post.go @@ -648,7 +648,7 @@ func (a *App) DeletePostFiles(post *model.Post) { func (a *App) SearchPostsInTeam(terms string, userId string, teamId string, isOrSearch bool, includeDeletedChannels bool) (*model.PostSearchResults, *model.AppError) { paramsList := model.ParseSearchParams(terms) - includeDeleted := includeDeletedChannels && *a.Config().TeamSettings.ViewArchivedChannels + includeDeleted := includeDeletedChannels && *a.Config().TeamSettings.ExperimentalViewArchivedChannels esInterface := a.Elasticsearch if license := a.License(); esInterface != nil && *a.Config().ElasticsearchSettings.EnableSearching && license != nil && *license.Features.Elasticsearch { |