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

removed checks that would send the user to 404 if the slug didn't match, restored old behaviour of redirecting to the correct slug. #3047

Browse Source
This commit is contained in:
Julian Lam
2015-04-18 14:47:04 -04:00
parent da5909349b
commit 8ee40ece71
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/categories.js
View File

@@ -188,15 +188,11 @@ categoriesController.get = function(req, res, next) {
return helpers.notFound(req, res); return helpers.notFound(req, res);
} }
if (req.params.slug && cid + '/' + req.params.slug !== results.categoryData.slug) {
return helpers.notFound(req, res);
}
if (!results.privileges.read) { if (!results.privileges.read) {
return helpers.notAllowed(req, res); return helpers.notAllowed(req, res);
} }
if (!req.params.slug && results.categoryData.slug && results.categoryData.slug !== cid + '/') { if ((!req.params.slug || results.categoryData.slug !== cid + '/' + req.params.slug) && (results.categoryData.slug && results.categoryData.slug !== cid + '/')) {
return helpers.redirect(res, '/category/' + encodeURI(results.categoryData.slug)); return helpers.redirect(res, '/category/' + encodeURI(results.categoryData.slug));
} }

6
src/controllers/topics.js
View File

@@ -43,15 +43,11 @@ topicsController.get = function(req, res, next) {
function (results, next) { function (results, next) {
userPrivileges = results.privileges; userPrivileges = results.privileges;
if (userPrivileges.disabled || (req.params.slug && tid + '/' + req.params.slug !== results.topic.slug)) {
return helpers.notFound(req, res);
}
if (!userPrivileges.read || (parseInt(results.topic.deleted, 10) && !userPrivileges.view_deleted)) { if (!userPrivileges.read || (parseInt(results.topic.deleted, 10) && !userPrivileges.view_deleted)) {
return helpers.notAllowed(req, res); return helpers.notAllowed(req, res);
} }
if (!req.params.slug && results.topic.slug && results.topic.slug !== tid + '/') { if ((!req.params.slug || results.topic.slug !== tid + '/' + req.params.slug) && (results.topic.slug && results.topic.slug !== tid + '/')) {
return helpers.redirect(res, '/topic/' + encodeURI(results.topic.slug)); return helpers.redirect(res, '/topic/' + encodeURI(results.topic.slug));
} }