diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-09-17 14:03:00 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-09-17 14:03:00 +0200 |
| commit | b5ee1d8936f64178b88eb289babafa020c24085d (patch) | |
| tree | 8d61af085b79ced43a10ce94f463fe7167cea7cd | |
| parent | 25250f46b4f110e9c9a1a1f4366889c3701bca18 (diff) | |
Keep sort and order after marking as read (#7974)
fix https://github.com/FreshRSS/FreshRSS/issues/7867
| -rw-r--r-- | app/Controllers/entryController.php | 6 | ||||
| -rw-r--r-- | app/layout/nav_menu.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/stream-footer.phtml | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php index 0cf25e24d..cbba1817e 100644 --- a/app/Controllers/entryController.php +++ b/app/Controllers/entryController.php @@ -183,6 +183,12 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController { } if (!$this->ajax) { + if (Minz_Request::hasParam('order')) { + $params['order'] = Minz_Request::paramString('order', plaintext: true); + } + if (Minz_Request::hasParam('sort')) { + $params['sort'] = Minz_Request::paramString('sort', plaintext: true); + } Minz_Request::good( $is_read ? _t('feedback.sub.articles.marked_read') : _t('feedback.sub.articles.marked_unread'), [ diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 0128360b8..11efa5763 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -121,6 +121,8 @@ 'idMax' => FreshRSS_Context::$id_max, 'search' => htmlspecialchars_decode(FreshRSS_Context::$search->getRawInput(), ENT_QUOTES), 'state' => FreshRSS_Context::$state, + 'sort' => FreshRSS_Context::$sort, + 'order' => FreshRSS_Context::$order, ], ]; diff --git a/app/views/helpers/stream-footer.phtml b/app/views/helpers/stream-footer.phtml index 9984a2429..5165a115e 100644 --- a/app/views/helpers/stream-footer.phtml +++ b/app/views/helpers/stream-footer.phtml @@ -20,6 +20,8 @@ 'idMax' => FreshRSS_Context::$id_max, 'search' => htmlspecialchars_decode(FreshRSS_Context::$search->getRawInput(), ENT_QUOTES), 'state' => FreshRSS_Context::$state, + 'sort' => FreshRSS_Context::$sort, + 'order' => FreshRSS_Context::$order, ], ]; |