Skip to content
Snippets Groups Projects
Commit a4e7b8d7 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Merge pull request #646 from EreMaijala/login-followup-fix

Never set followup to lightbox.
parents a10bcbd9 cad4fe74
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