deleted topic feed fix

v1.18.x
barisusakli 11 years ago
parent eeabae5738
commit 870bf95e5b

@ -56,7 +56,7 @@ topicsController.get = function(req, res, next) {
topics.getTopicWithPosts(tid, set, uid, start, end, reverse, function (err, topicData) {
if (topicData) {
if (parseInt(topicData.deleted, 10) === 1 && !userPrivileges.view_deleted) {
if (topicData.deleted && !userPrivileges.view_deleted) {
return next(new Error('[[error:no-topic]]'));
}
topicData.currentPage = page;

@ -40,11 +40,21 @@ function hasPrivileges(method, id, req, res, next) {
function generateForTopic(req, res, next) {
var tid = req.params.topic_id;
var uid = req.user ? req.user.uid : 0;
privileges.topics.get(tid, uid, function(err, userPrivileges) {
if (err) {
return next(err);
}
topics.getTopicWithPosts(tid, 'tid:' + tid + ':posts', uid, 0, 25, false, function (err, topicData) {
if (err) {
return next(err);
}
if (topicData.deleted && !userPrivileges.view_deleted) {
return res.redirect('404');
}
var description = topicData.posts.length ? topicData.posts[0].content : '';
var image_url = topicData.posts.length ? topicData.posts[0].picture : '';
var author = topicData.posts.length ? topicData.posts[0].username : '';
@ -80,6 +90,7 @@ function generateForTopic(req, res, next) {
sendFeed(feed, res);
});
});
}
function generateForCategory(req, res, next) {

Loading…
Cancel
Save