Merge pull request #2890 from EvSpirit/master

#2886 Check subcategories when showing category recent topics

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));

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});
 			});
 		});