merged master

This commit is contained in:
Baris Usakli
2013-12-05 14:57:18 -05:00
9 changed files with 136 additions and 79 deletions

View File

@@ -463,7 +463,7 @@ var path = require('path'),
async.waterfall([
function (next) {
topics.getTopicWithPosts(tid, ((req.user) ? req.user.uid : 0), 0, -1, function (err, topicData) {
topics.getTopicWithPosts(tid, ((req.user) ? req.user.uid : 0), 0, -1, true, function (err, topicData) {
if (topicData) {
if (parseInt(topicData.deleted, 10) === 1 && parseInt(topicData.expose_tools, 10) === 0) {
return next(new Error('Topic deleted'), null);