Use PSR-7 responses in LogoutAction

diff --git a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
index 50afa676ae5a6bb6042df2b84d635de617ff962e..c5386cd5163cfbe308a3d167d867e1a683304e4a 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
@@ -2,10 +2,10 @@
 
 namespace wcf\acp\action;
 
+use Laminas\Diactoros\Response\RedirectResponse;
 use wcf\action\AbstractSecureAction;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
-use wcf\util\HeaderUtil;
 
 /**
  * Does the user logout in the admin control panel (clearing reauthentication).
@@ -33,10 +33,10 @@ class LogoutAction extends AbstractSecureAction
 
         $this->executed();
 
-        HeaderUtil::redirect(LinkHandler::getInstance()->getLink(null, [
-            'forceFrontend' => true,
-        ]));
-
-        exit;
+        return new RedirectResponse(
+            LinkHandler::getInstance()->getLink(null, [
+                'forceFrontend' => true,
+            ])
+        );
     }
 }

diff --git a/wcfsetup/install/files/lib/action/LogoutAction.class.php b/wcfsetup/install/files/lib/action/LogoutAction.class.php
index 690dc9f8766d83abaa7f5b665eda4ea78cd01bdb..9b06b5782449ea04c55a584e1501129351bd280b 100644 (file)
--- a/wcfsetup/install/files/lib/action/LogoutAction.class.php
+++ b/wcfsetup/install/files/lib/action/LogoutAction.class.php
@@ -2,9 +2,9 @@
 
 namespace wcf\action;
 
+use Laminas\Diactoros\Response\RedirectResponse;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
-use wcf\util\HeaderUtil;
 
 /**
  * Does the user logout.
@@ -29,9 +29,8 @@ class LogoutAction extends \wcf\acp\action\LogoutAction
 
         $this->executed();
 
-        // forward to index page
-        HeaderUtil::redirect(LinkHandler::getInstance()->getLink());
-
-        exit;
+        return new RedirectResponse(
+            LinkHandler::getInstance()->getLink()
+        );
     }
 }