Pull the URI from the PSR-7 request in EnforceAcpAuthentication::logRequest()

diff --git a/wcfsetup/install/files/lib/http/middleware/EnforceAcpAuthentication.class.php b/wcfsetup/install/files/lib/http/middleware/EnforceAcpAuthentication.class.php
index 02dfd32b911524d8ca0d0412098c9ac2bd9b1789..881cd7323f4a3a40893843b485df86e4a516004e 100644 (file)
--- a/wcfsetup/install/files/lib/http/middleware/EnforceAcpAuthentication.class.php
+++ b/wcfsetup/install/files/lib/http/middleware/EnforceAcpAuthentication.class.php
@@ -182,7 +182,7 @@ final class EnforceAcpAuthentication implements MiddlewareInterface
         }
 
         // Fetch request URI + request ID (if available).
-        $requestURI = UserUtil::getRequestURI();
+        $requestURI = Helper::getPathAndQuery($request->getUri());
         if ($requestId = \wcf\getRequestId()) {
             $requestIdSuffix = ' (' . $requestId . ')';
             // Ensure that the request ID fits by truncating the URI.