From a70e750fa0e990f24fc36c2c051e7c295b1171f5 Mon Sep 17 00:00:00 2001
From: Nick <nick@bywatersolutions.com>
Date: Tue, 10 Sep 2019 14:04:43 +0000
Subject: [PATCH] Bug 23526: Don't use encoded question mark in shib_login_url

To test:
1 - Enable shib
2 - Do a search
3 - Try to login from search
4 - Get an error
5 - Apply patch
6 - Retry

Note: You do have to fully configure shibboleth, you can simply enable it in koha-conf.xml and check the URLs.
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 16aa7d1c8afe249318767a8a023f7dbddb6843ea)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit da602a96ad96163f624a65822db13ef68ed5644a)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 C4/Auth_with_shibboleth.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
index bb0a342fd1..55cee73569 100644
--- a/C4/Auth_with_shibboleth.pm
+++ b/C4/Auth_with_shibboleth.pm
@@ -63,7 +63,7 @@ sub login_shib_url {
 
     my $param = _get_uri() . get_script_name();
     if ( $query->query_string() ) {
-        $param = $param . '%3F' . $query->query_string();
+        $param = $param . '?' . $query->query_string();
     }
     my $uri = _get_uri() . "/Shibboleth.sso/Login?target=$param";
     return $uri;
-- 
2.39.5