Skip to content
Snippets Groups Projects
Commit cad4fe74 authored by Ere Maijala's avatar Ere Maijala
Browse files

Never set followup to lightbox. Otherwise e.g. Shibboleth login with...

Never set followup to lightbox. Otherwise e.g. Shibboleth login with ChoiceAuth will return to a lightbox page.
parent 08c9faba
No related merge requests found
......@@ -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);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment