codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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