Skip to content

Commit

Permalink
Merge branch '5.0'
Browse files Browse the repository at this point in the history
Bastian Heist committed Aug 17, 2018

Verified

This commit was signed with the committer’s verified signature.
jochenklar Jochen Klar
2 parents 2ad81e6 + caa91c8 commit d66156a
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions Classes/Controller/LoginController.php
Original file line number Diff line number Diff line change
@@ -111,12 +111,9 @@ public function logoutAction()

if (is_string($result)) {
$this->redirectToUriAndShutdown($result);

} elseif ($result instanceof ActionRequest) {
$this->redirectToRequest($result);
}

if ($result === null) {
} else if ($result === null) {
// Default: redirect to login
$this->redirect('login');
} else {
@@ -174,7 +171,6 @@ protected function redirectToUriAndShutdown(string $result)
$response->setHeader('Status', '303');

$response->setContent('<html><head><meta http-equiv="refresh" content="0;url=' . $escapedUri . '"/></head></html>');
$response->send();

$this->bootstrap->shutdown(Bootstrap::RUNLEVEL_RUNTIME);
}

0 comments on commit d66156a

Please sign in to comment.