Merge remote-tracking branch 'origin/master' into 0.5.1

11 years ago · 9511e4a633
parent 5dd90880d4 b16932a676
commit 9511e4a633
1 changed files with 4 additions and 1 deletions
--- a/src/topics.js
+++ b/src/topics.js
@ -262,7 +262,10 @@ var async = require('async'),
 							return next(err);
 						}

-						pids = [topicData.mainPid].concat(pids);
+						pids = topicData.mainPid ? [topicData.mainPid].concat(pids) : pids;
+						if (!pids.length) {
+							return next(null, []);
+						}
 						posts.getPostsByPids(pids, tid, function(err, posts) {
 							if (err) {
 								return next(err);