Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 18:26:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into optimize-22-09-2013

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Julian Lam
2013-09-23 20:04:09 -04:00
parent 3254979568 290d69d14a
commit 99440585e6
21 changed files with 10248 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/posts.js
View File

@@ -70,7 +70,7 @@ var RDB = require('./redis.js'),
Posts.getPostFields(pid, ['pid', 'tid', 'content', 'uid', 'timestamp', 'deleted'], function(postData) {
if (postData.deleted === '1') return callback(null);
else {
postData.relativeTime = new Date(parseInt(postData.timestamp, 10)).toISOString();
postData.relativeTime = new Date(parseInt(postData.timestamp || 0, 10)).toISOString();
next(null, postData);
}
});