Merge pull request #4448 from BenLubar/double-escape

fix double-URL-encoding causing redirect loops

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;

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;
 				}