fixed minor issue, removed unused postPerPage

v1.18.x
Baris Soner Usakli 11 years ago
parent 9f1e0187ee
commit 400af61e12

@ -157,7 +157,7 @@ var async = require('async'),
user.sendPostNotificationToFollowers(uid, tid, postData.pid); user.sendPostNotificationToFollowers(uid, tid, postData.pid);
next(err, postData); next(null, postData);
}, },
function(postData, next) { function(postData, next) {
Topics.markAsUnreadForAll(tid, function(err) { Topics.markAsUnreadForAll(tid, function(err) {
@ -825,18 +825,14 @@ var async = require('async'),
async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData, getPageCount], function(err, results) { async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData, getPageCount], function(err, results) {
if (err) { if (err) {
winston.error('[Topics.getTopicWithPosts] Could not retrieve topic data: ', err.message); winston.error('[Topics.getTopicWithPosts] Could not retrieve topic data: ', err.message);
return callback(err, null); return callback(err);
} }
var topicData = results[0], var topicData = results[0],
topicPosts = results[1],
privileges = results[2], privileges = results[2],
categoryData = results[3], categoryData = results[3],
pageCount = results[4]; pageCount = results[4];
var postsPerPage = parseInt(meta.config.postsPerPage, 10);
postsPerPage = postsPerPage ? postsPerPage : 20;
callback(null, { callback(null, {
'topic_name': topicData.title, 'topic_name': topicData.title,
'category_name': categoryData.name, 'category_name': categoryData.name,
@ -853,7 +849,7 @@ var async = require('async'),
'topic_id': tid, 'topic_id': tid,
'expose_tools': privileges.editable ? 1 : 0, 'expose_tools': privileges.editable ? 1 : 0,
'disableSocialButtons': meta.config.disableSocialButtons !== undefined ? parseInt(meta.config.disableSocialButtons, 10) !== 0 : false, 'disableSocialButtons': meta.config.disableSocialButtons !== undefined ? parseInt(meta.config.disableSocialButtons, 10) !== 0 : false,
'posts': topicPosts 'posts': results[1]
}); });
}); });
}); });

Loading…
Cancel
Save