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

closes #3508

Browse Source
This commit is contained in:
barisusakli
2015-08-28 14:31:35 -04:00
parent bdfb168f2f
commit 25502f0687
13 changed files with 114 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/topics.js
View File

@@ -16,13 +16,13 @@ var topicsController = {},
pagination = require('../pagination'),
utils = require('../../public/src/utils');
topicsController.get = function(req, res, next) {
topicsController.get = function(req, res, callback) {
var tid = req.params.topic_id,
sort = req.query.sort,
userPrivileges;
if ((req.params.post_index && !utils.isNumber(req.params.post_index)) || !utils.isNumber(tid)) {
return helpers.notFound(req, res);
return callback();
}
async.waterfall([
@@ -60,7 +60,7 @@ topicsController.get = function(req, res, next) {
}
if (settings.usePagination && (page < 1 || page > pageCount)) {
return helpers.notFound(req, res);
return callback();
}
var set = 'tid:' + tid + ':posts',
@@ -109,7 +109,7 @@ topicsController.get = function(req, res, next) {
topics.getTopicWithPosts(tid, set, req.uid, start, stop, reverse, function (err, topicData) {
if (err && err.message === '[[error:no-topic]]' && !topicData) {
return helpers.notFound(req, res);
return callback();
}
if (err && !topicData) {
@@ -247,7 +247,7 @@ topicsController.get = function(req, res, next) {
}
], function (err, data) {
if (err) {
return next(err);
return callback(err);
}
data.privileges = userPrivileges;
@@ -264,7 +264,7 @@ topicsController.get = function(req, res, next) {
plugins.fireHook('filter:topic.build', {req: req, res: res, templateData: data}, function(err, data) {
if (err) {
return next(err);
return callback(err);
}
res.render('topic', data.templateData);
});