From cad4fe74009e478fbb11d3d785aa7145e32454b6 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Tue, 22 Mar 2016 11:15:40 +0200
Subject: [PATCH] Never set followup to lightbox. Otherwise e.g. Shibboleth
login with ChoiceAuth will return to a lightbox page.
---
.../VuFind/src/VuFind/Controller/AbstractBase.php | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index fec2be99b27..226d1109c0b 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -261,16 +261,13 @@ class AbstractBase extends AbstractActionController
$msg = 'You must be logged in first';
}
- // If we're doing off-site login requests,
- // we don't want to return to the lightbox
+ // We don't want to return to the lightbox
$serverUrl = $this->getServerUrl();
- if ($this->getAuthManager()->getSessionInitiator($serverUrl)) {
- $serverUrl = str_replace(
- ['?layout=lightbox', '&layout=lightbox'],
- ['?', '&'],
- $serverUrl
- );
- }
+ $serverUrl = str_replace(
+ ['?layout=lightbox', '&layout=lightbox'],
+ ['?', '&'],
+ $serverUrl
+ );
// Store the current URL as a login followup action
$this->followup()->store($extras, $serverUrl);
--
GitLab