From 0fcd4dee584d5bf8752ee3e7262297341830bcbb Mon Sep 17 00:00:00 2001 From: EvSpirit Date: Tue, 24 Mar 2015 21:39:28 +0300 Subject: [PATCH] #2886 Check subcategories when showing category recent topics --- src/categories/recentreplies.js | 3 ++- src/posts/summary.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js index 596bd6882e..11b16897fc 100644 --- a/src/categories/recentreplies.js +++ b/src/categories/recentreplies.js @@ -61,7 +61,8 @@ module.exports = function(Categories) { function assignPostsToCategory(category, posts) { category.posts = posts.filter(function(post) { - return post.category && parseInt(post.category.cid, 10) === parseInt(category.cid, 10); + return !!(post.category && (parseInt(post.category.cid, 10) === parseInt(category.cid, 10) + ) || (parseInt(post.category.parentCid, 10) === parseInt(category.cid, 10))); }).sort(function(a, b) { return b.timestamp - a.timestamp; }).slice(0, parseInt(category.numRecentReplies, 10)); diff --git a/src/posts/summary.js b/src/posts/summary.js index 6d098cd829..15f2f645ad 100644 --- a/src/posts/summary.js +++ b/src/posts/summary.js @@ -120,7 +120,7 @@ module.exports = function(Posts) { return topic && array.indexOf(topic) === index; }); - categories.getMultipleCategoryFields(cids, ['cid', 'name', 'icon', 'slug'], function(err, categories) { + categories.getMultipleCategoryFields(cids, ['cid', 'name', 'icon', 'slug', 'parentCid'], function(err, categories) { callback(err, {topics: topics, categories: categories}); }); });