From 7c0844109d62f16e1c1b7ba816b6ed7395de8b35 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 30 Jan 2024 09:02:19 +0100 Subject: [PATCH] Bug 35935: Ensure login branch will be used after incorrect login If a different branch is selected after an incorrect login, the previous branch will be used. To recreate: * login with foo/bar, select CPL => FAIL * login with koha/koha, select another branch => OK but CPL is picked! It was caused by a dup of "branch" in CGI param list (and first was picked). This patch patch also removes "koha_login_context" to not have it twice. You can also open the source of the page to confirm that form#loginform contains "branch" and "koha_login_context" in hidden inputs. Signed-off-by: Magnus Enger Tested in KTD. Works as advertised. Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 7c54394383234f33dcf5b6acb8ceabb72d0deca4) Signed-off-by: Fridolin Somers (cherry picked from commit b94bb009dca187cba85c072f1d7e00af484bdcea) Signed-off-by: Lucas Gass --- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index e87cb438c4..0ae4cbefa2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -105,6 +105,8 @@
[% FOREACH INPUT IN INPUTS %] + [% NEXT IF INPUT.name == "koha_login_context" %] + [% NEXT IF INPUT.name == "branch" %] [% END %]

-- 2.39.5