Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-17 05:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-05-25 11:57:10 -04:00
parent a68fc1dc50
commit a79707ef9a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/controllers/category.js
View File

@@ -3,6 +3,7 @@
const nconf = require('nconf');
const validator = require('validator');
const qs = require('querystring');
const db = require('../database');
const privileges = require('../privileges');
@@ -42,7 +43,7 @@ categoryController.get = async function (req, res, next) {
return next();
}
if (topicIndex < 0) {
return helpers.redirect(res, '/category/' + categoryFields.slug);
return helpers.redirect(res, `/category/${categoryFields.slug}?${qs.stringify(req.query)}`);
}
if (!userPrivileges.read) {
@@ -50,7 +51,7 @@ categoryController.get = async function (req, res, next) {
}
if (!res.locals.isAPI && !req.params.slug && (categoryFields.slug && categoryFields.slug !== `${cid}/`)) {
return helpers.redirect(res, `/category/${categoryFields.slug}`, true);
return helpers.redirect(res, `/category/${categoryFields.slug}?${qs.stringify(req.query)}`, true);
}
if (categoryFields.link) {
@@ -86,7 +87,7 @@ categoryController.get = async function (req, res, next) {
}
if (topicIndex > Math.max(categoryData.topic_count - 1, 0)) {
return helpers.redirect(res, '/category/' + categoryData.slug + '/' + categoryData.topic_count);
return helpers.redirect(res, `/category/${categoryData.slug}/${categoryData.topic_count}?${qs.stringify(req.query)}`);
}
const pageCount = Math.max(1, Math.ceil(categoryData.topic_count / userSettings.topicsPerPage));
if (userSettings.usePagination && currentPage > pageCount) {