From 4a2c93c9e71f85f06025ea2e9d8692c8b5780a48 Mon Sep 17 00:00:00 2001
From: Inverle <inverle@proton.me>
Date: Mon, 2 Mar 2026 21:45:38 +0100
Subject: [PATCH] Fix redirect to wrong view after mark as read (#8552)

fix https://github.com/FreshRSS/FreshRSS/issues/6509
A wrong redirect (to normal view) happened in case of both the big mark as read button on the bottom and the navbar
one, for reader and global views.
---
 app/Controllers/entryController.php   | 2 +-
 app/layout/nav_menu.phtml             | 1 +
 app/views/helpers/stream-footer.phtml | 1 +
 app/views/index/global.phtml          | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index c8f4bf8d1..e6c5b9f66 100644
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -200,7 +200,7 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {
 				$is_read ? _t('feedback.sub.articles.marked_read') : _t('feedback.sub.articles.marked_unread'),
 				[
 					'c' => 'index',
-					'a' => 'index',
+					'a' => Minz_Request::paramStringNull('from') ?? 'index',
 					'params' => $params,
 				],
 				notificationName: 'readAction ',
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index f168f8d65..febd5d5ef 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -125,6 +125,7 @@
 				'state' => FreshRSS_Context::$state,
 				'sort' => FreshRSS_Context::$sort,
 				'order' => FreshRSS_Context::$order,
+				'from' => Minz_Request::actionName(),
 			],
 		];
 
diff --git a/app/views/helpers/stream-footer.phtml b/app/views/helpers/stream-footer.phtml
index d2334f2e8..7656c7e40 100644
--- a/app/views/helpers/stream-footer.phtml
+++ b/app/views/helpers/stream-footer.phtml
@@ -22,6 +22,7 @@
 			'state' => FreshRSS_Context::$state,
 			'sort' => FreshRSS_Context::$sort,
 			'order' => FreshRSS_Context::$order,
+			'from' => Minz_Request::paramStringNull('from') ?? Minz_Request::actionName(),
 		],
 	];
 
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 1ad92d2fc..0593523b0 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -42,6 +42,7 @@
 	$params = array_filter($_GET, 'is_string', ARRAY_FILTER_USE_KEY);
 	unset($params['c']);
 	unset($params['a']);
+	$params['from'] = 'global';
 	$url_base = [
 		'c' => 'index',
 		'a' => 'normal',