Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed crash if empty topic was loaded without ajaxify

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-18 23:18:58 -05:00
parent 84cbcc5a97
commit bbac361670
7 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/posts.js
View File

@@ -189,7 +189,7 @@ var db = require('./database'),
if (parseInt(postData.deleted, 10) === 1) {
return callback(null);
} else {
postData.relativeTime = new Date(parseInt(postData.timestamp || 0, 10)).toISOString();
postData.relativeTime = utils.toISOString(postData.timestamp);
next(null, postData);
}
});
@@ -318,30 +318,28 @@ var db = require('./database'),
}
db.getObjects(keys, function(err, data) {
async.map(data, function(postData, _callback) {
if (postData) {
if(err) {
return callback(err);
}
try {
postData.relativeTime = new Date(parseInt(postData.timestamp,10)).toISOString();
postData.relativeEditTime = parseInt(postData.edited, 10) !== 0 ? (new Date(parseInt(postData.edited, 10)).toISOString()) : '';
} catch(e) {
require('winston').err('invalid time value');
async.map(data, function(postData, next) {
if(!postData) {
return next(null);
}
postData.relativeTime = utils.toISOString(postData.timestamp);
postData.relativeEditTime = parseInt(postData.edited, 10) !== 0 ? utils.toISOString(postData.edited) : '';
postTools.parse(postData.content, function(err, content) {
if(err) {
return next(err);
}
postTools.parse(postData.content, function(err, content) {
postData.content = content;
_callback(null, postData);
});
} else {
_callback(null);
}
}, function(err, posts) {
if (!err) {
return callback(null, posts);
} else {
return callback(err, null);
}
});
postData.content = content;
next(null, postData);
});
}, callback);
});
}