github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 04:31:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into vdom

Browse Source
This commit is contained in:
Sam 2016-02-19 17:09:28 +11:00
commit 8493057942
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/category_list.rb
View File

@ -146,9 +146,8 @@ class CategoryList
def prune_empty
if @guardian.can_create?(Category) && !SiteSetting.allow_uncategorized_topics
# HACK: Don't show uncategorized to admins either, if uncategorized topics are not allowed
# and there are none.
unless SiteSetting.allow_uncategorized_topics
# HACK: Don't show uncategorized to anyone if not allowed
@categories.delete_if do |c|
c.uncategorized? && c.displayable_topics.blank?
end