github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 13:51:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Merge settings related to muted tags. (#7656)

Browse Source
This commit is contained in:
Dan Ungureanu
2019-06-03 05:23:23 +03:00
committed by Sam
parent 0955d9ece9
commit c1e7a1b292
9 changed files with 70 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/topic_query.rb
View File

@ -875,7 +875,7 @@ class TopicQuery
list
end
def remove_muted_tags(list, user, opts = nil)
if user.nil? || !SiteSetting.tagging_enabled || !SiteSetting.remove_muted_tags_from_latest
if user.nil? || !SiteSetting.tagging_enabled || SiteSetting.remove_muted_tags_from_latest == 'never'
return list
end
@ -896,7 +896,7 @@ class TopicQuery
return list
end
if SiteSetting.mute_other_present_tags
if SiteSetting.remove_muted_tags_from_latest == 'always'
list = list.where("
NOT EXISTS(
SELECT 1