Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: explicitly tracked topics will show up even if category is muted

This commit is contained in:
Sam 2015-10-13 17:54:31 +11:00
parent a27abf5ce7
commit a56e3ccea0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/topic_query.rb
View File

@ -408,8 +408,10 @@ class TopicQuery
AND cu.category_id = topics.category_id AND cu.category_id = topics.category_id
AND cu.notification_level = :muted AND cu.notification_level = :muted
AND cu.category_id <> :category_id AND cu.category_id <> :category_id
AND (tu.notification_level IS NULL OR tu.notification_level < :tracking)
)", user_id: user.id, )", user_id: user.id,
muted: CategoryUser.notification_levels[:muted], muted: CategoryUser.notification_levels[:muted],
tracking: TopicUser.notification_levels[:tracking],
category_id: category_id || -1) category_id: category_id || -1)
end end