From 9484ddc36ff6a4ff85e3a623f567387407360fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 27 Apr 2023 21:39:24 -0400 Subject: [PATCH] fix: use query param sort over user setting if it's set regression from https://github.com/NodeBB/NodeBB/commit/77ddfc642e992b19be213590746f39db73402ef1 --- public/src/client/category.js | 2 +- public/src/client/topic/posts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/category.js b/public/src/client/category.js index 991f4eb85e..86f76381ab 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -139,7 +139,7 @@ define('forum/category', [ after: after, direction: direction, query: params, - categoryTopicSort: config.categoryTopicSort, + categoryTopicSort: params.sort || config.categoryTopicSort, }, function (data, done) { hooks.fire('action:topics.loaded', { topics: data.topics }); callback(data, done); diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index bf4eb868f6..0ca7493536 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -270,7 +270,7 @@ define('forum/topic/posts', [ after: after + (direction > 0 ? 1 : 0), count: config.postsPerPage, direction: direction, - topicPostSort: config.topicPostSort, + topicPostSort: utils.params().sort || config.topicPostSort, }, function (data, done) { indicatorEl.fadeOut();