mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 17:46:05 -05:00
FIX: Safety checks for categories index
This commit is contained in:
parent
b4544eb027
commit
33d0a6a876
1 changed files with 5 additions and 3 deletions
|
@ -54,8 +54,10 @@ class CategoryList
|
|||
c.displayable_topics = []
|
||||
topics_in_cat.each do |topic_id|
|
||||
topic = @topics_by_id[topic_id]
|
||||
topic.category = c
|
||||
c.displayable_topics << topic
|
||||
if topic.present?
|
||||
topic.category = c
|
||||
c.displayable_topics << topic
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -91,7 +93,7 @@ class CategoryList
|
|||
# Find the appropriate place to insert it:
|
||||
insert_at = nil
|
||||
@categories.each_with_index do |c, idx|
|
||||
if uncategorized.topics_week > (c.topics_week || 0)
|
||||
if (uncategorized.topics_week || 0) > (c.topics_week || 0)
|
||||
insert_at = idx
|
||||
break
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue