diff --git a/public/src/forum/admin/topics.js b/public/src/forum/admin/topics.js index 8960bed25d..5750e83f37 100644 --- a/public/src/forum/admin/topics.js +++ b/public/src/forum/admin/topics.js @@ -59,6 +59,7 @@ define(function() { topicsListEl.innerHTML += html; btnEl.innerHTML = 'Load More Topics'; + $('span.timeago').timeago(); } else { // Exhausted all topics btnEl.className += ' disabled'; diff --git a/public/templates/admin/topics.tpl b/public/templates/admin/topics.tpl index 1521f400ac..f970823db8 100644 --- a/public/templates/admin/topics.tpl +++ b/public/templates/admin/topics.tpl @@ -11,7 +11,7 @@ {topics.title}
diff --git a/src/topics.js b/src/topics.js index b40b67eb7c..76408b9fb5 100644 --- a/src/topics.js +++ b/src/topics.js @@ -22,8 +22,12 @@ var RDB = require('./redis.js'), Topics.getTopicData = function(tid, callback) { RDB.hgetall('topic:' + tid, function(err, data) { if (err === null) { - if(data) + if(data) { data.title = validator.sanitize(data.title).escape(); + if(data.timestamp) { + data.relativeTime = new Date(parseInt(data.timestamp, 10)).toISOString(); + } + } callback(data); } else { @@ -327,8 +331,6 @@ var RDB = require('./redis.js'), topicData['lock-icon'] = topicData.locked === '1' ? 'icon-lock' : 'none'; topicData['deleted-class'] = topicData.deleted === '1' ? 'deleted' : ''; - topicData.relativeTime = new Date(parseInt(topicData.timestamp, 10)).toISOString(); - topicData.username = topicInfo.username; topicData.badgeclass = (topicInfo.hasread && current_user != 0) ? '' : 'badge-important'; topicData.teaser_text = topicInfo.teaserInfo.text || '', @@ -455,7 +457,6 @@ var RDB = require('./redis.js'), hasRead = results[1], teaser = results[2]; - topicData.relativeTime = new Date(parseInt(topicData.timestamp,10)).toISOString(); topicData.badgeclass = hasRead ? '' : 'badge-important'; topicData.teaser_text = teaser.text || ''; topicData.teaser_username = teaser.username || '';