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

closes #3311

Browse Source
This commit is contained in:
barisusakli
2015-07-10 16:43:25 -04:00
parent 534b13e089
commit 072d287183
5 changed files with 81 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/topics/teaser.js
View File

@@ -5,6 +5,7 @@
var async = require('async'),
S = require('string'),
meta = require('../meta'),
db = require('../database'),
user = require('../user'),
posts = require('../posts'),
@@ -24,8 +25,12 @@ module.exports = function(Topics) {
topics.forEach(function(topic) {
counts.push(topic && (parseInt(topic.postcount, 10) || 0));
if (topic && topic.teaserPid) {
teaserPids.push(topic.teaserPid);
if (topic) {
if (meta.config.teaserPost === 'first') {
teaserPids.push(topic.mainPid);
} else {
teaserPids.push(topic.teaserPid);
}
}
});
@@ -65,7 +70,7 @@ module.exports = function(Topics) {
return null;
}
if (tidToPost[topic.tid]) {
tidToPost[topic.tid].index = counts[index];
tidToPost[topic.tid].index = meta.config.teaserPost === 'first' ? 1 : counts[index];
if (tidToPost[topic.tid].content) {
var s = S(tidToPost[topic.tid].content);
tidToPost[topic.tid].content = s.stripTags.apply(s, utils.stripTags).s;