Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

prevent getTopicsByTids crash if a topic is null

Browse Source
This commit is contained in:
barisusakli
2014-09-13 19:33:09 -04:00
parent ae02c1a06c
commit 6bde9a1656
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/topics.js
View File

@@ -172,9 +172,9 @@ var async = require('async'),
Topics.getTopicsData(tids, function(err, topics) { Topics.getTopicsData(tids, function(err, topics) {
function mapFilter(array, field) { function mapFilter(array, field) {
return array.map(function(topic) { return array.map(function(topic) {
return topic[field]; return topic && topic[field];
}).filter(function(value, index, array) { }).filter(function(value, index, array) {
return array.indexOf(value) === index; return value && array.indexOf(value) === index;
}); });
} }
@@ -225,6 +225,7 @@ var async = require('async'),
}); });
for (var i=0; i<topics.length; ++i) { for (var i=0; i<topics.length; ++i) {
if (topics[i]) {
topics[i].category = categories[topics[i].cid]; topics[i].category = categories[topics[i].cid];
topics[i].category.disabled = parseInt(topics[i].category.disabled, 10) === 1; topics[i].category.disabled = parseInt(topics[i].category.disabled, 10) === 1;
topics[i].user = users[topics[i].uid]; topics[i].user = users[topics[i].uid];
@@ -237,9 +238,10 @@ var async = require('async'),
topics[i].unread = !(results.hasRead[i] && parseInt(uid, 10) !== 0); topics[i].unread = !(results.hasRead[i] && parseInt(uid, 10) !== 0);
topics[i].unreplied = parseInt(topics[i].postcount, 10) <= 1; topics[i].unreplied = parseInt(topics[i].postcount, 10) <= 1;
} }
}
topics = topics.filter(function(topic) { topics = topics.filter(function(topic) {
return !topic.category.disabled && return topic && !topic.category.disabled &&
(!topic.deleted || (topic.deleted && isAdminOrMod[topic.cid]) || (!topic.deleted || (topic.deleted && isAdminOrMod[topic.cid]) ||
parseInt(topic.uid, 10) === parseInt(uid, 10)); parseInt(topic.uid, 10) === parseInt(uid, 10));
}); });