diff --git a/src/topics.js b/src/topics.js index b92d0b51bf..0079c501ce 100644 --- a/src/topics.js +++ b/src/topics.js @@ -192,7 +192,8 @@ var social = require('./social'); isFollowing: async.apply(Topics.isFollowing, [topicData.tid], uid), isIgnoring: async.apply(Topics.isIgnoring, [topicData.tid], uid), bookmark: async.apply(Topics.getUserBookmark, topicData.tid, uid), - postSharing: async.apply(social.getActivePostSharing) + postSharing: async.apply(social.getActivePostSharing), + related: async.apply(Topics.getRelatedTopics, topicData, uid) }, next); }, function (results, next) { @@ -205,6 +206,7 @@ var social = require('./social'); topicData.isIgnoring = results.isIgnoring[0]; topicData.bookmark = results.bookmark; topicData.postSharing = results.postSharing; + topicData.related = results.related || []; topicData.unreplied = parseInt(topicData.postcount, 10) === 1; topicData.deleted = parseInt(topicData.deleted, 10) === 1; @@ -213,10 +215,6 @@ var social = require('./social'); topicData.icons = []; - Topics.getRelatedTopics(topicData, uid, next); - }, - function (related, next) { - topicData.related = related || []; plugins.fireHook('filter:topic.get', {topic: topicData, uid: uid}, next); }, function (data, next) { diff --git a/src/topics/tags.js b/src/topics/tags.js index 83702331b7..ec16c09ff6 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -316,7 +316,7 @@ module.exports = function(Topics) { return plugins.fireHook('filter:topic.getRelatedTopics', {topic: topicData, uid: uid}, callback); } - var maximumTopics = parseInt(meta.config.maximumRelatedTopics, 10); + var maximumTopics = parseInt(meta.config.maximumRelatedTopics, 10) || 0; if (maximumTopics === 0 || !topicData.tags.length) { return callback(null, []); }