From 47c8c69264de7ca474ffffe6370c731f0b921637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= <barisusakli@gmail.com> Date: Thu, 8 Jul 2021 11:06:20 -0400 Subject: [PATCH] fix: keep query string on redirects --- src/controllers/topics.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index a407e089f1..2ada5f590a 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -1,6 +1,7 @@ 'use strict'; const nconf = require('nconf'); +const qs = require('querystring'); const user = require('../user'); const meta = require('../meta'); @@ -58,7 +59,7 @@ topicsController.get = async function getTopic(req, res, callback) { } if (!res.locals.isAPI && (!req.params.slug || topicData.slug !== `${tid}/${req.params.slug}`) && (topicData.slug && topicData.slug !== `${tid}/`)) { - return helpers.redirect(res, `/topic/${topicData.slug}${postIndex ? `/${postIndex}` : ''}${currentPage > 1 ? `?page=${currentPage}` : ''}`, true); + return helpers.redirect(res, `/topic/${topicData.slug}${postIndex ? `/${postIndex}` : ''}?${qs.stringify(req.query)}`, true); } if (postIndex === 'unread') { @@ -66,7 +67,7 @@ topicsController.get = async function getTopic(req, res, callback) { } if (utils.isNumber(postIndex) && topicData.postcount > 0 && (postIndex < 1 || postIndex > topicData.postcount)) { - return helpers.redirect(res, `/topic/${req.params.topic_id}/${req.params.slug}${postIndex > topicData.postcount ? `/${topicData.postcount}` : ''}`); + return helpers.redirect(res, `/topic/${tid}/${req.params.slug}${postIndex > topicData.postcount ? `/${topicData.postcount}` : ''}?${qs.stringify(req.query)}`); } postIndex = Math.max(1, postIndex); const sort = req.query.sort || settings.topicPostSort;