From c7cfe45d0b408a2991efd3bbd05b845e964cc345 Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Tue, 22 Mar 2016 19:54:27 -0500 Subject: [PATCH] fix double-URL-encoding causing redirect loops --- src/controllers/category.js | 2 +- src/controllers/topics.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/category.js b/src/controllers/category.js index e3adde496f..f80ad122a7 100644 --- a/src/controllers/category.js +++ b/src/controllers/category.js @@ -52,7 +52,7 @@ categoryController.get = function(req, res, callback) { } if (!res.locals.isAPI && (!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/' + results.categoryData.slug); } var settings = results.userSettings; diff --git a/src/controllers/topics.js b/src/controllers/topics.js index cb30caf4d3..c3c2847778 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -55,7 +55,7 @@ topicsController.get = function(req, res, callback) { } if (!res.locals.isAPI && (!req.params.slug || results.topic.slug !== tid + '/' + req.params.slug) && (results.topic.slug && results.topic.slug !== tid + '/')) { - var url = '/topic/' + encodeURI(results.topic.slug); + var url = '/topic/' + results.topic.slug; if (req.params.post_index){ url += '/'+req.params.post_index; }