return Uri

flarum · Jan 5, 2024 · 19168b6 · 19168b6
1 parent 743f4ea
commit 19168b6
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/framework/core/src/Forum/Controller/LogOutController.php b/framework/core/src/Forum/Controller/LogOutController.php
@@ -124,21 +124,22 @@ public function handle(Request $request): ResponseInterface
         return $this->rememberer->forget($response);
     }
 
-    protected function sanitizeReturnUrl(string $url, string $base): string
+    protected function sanitizeReturnUrl(string $url, string $base): Uri
     {
+        $parsedBase = new Uri($base);
         if (empty($url)) {
-            return $base; // Return base URL for empty return URL
+            return $parsedBase; // Return base URL for empty return URL
         }
 
         $parsed = new Uri($url);
 
         $host = $parsed->getHost();
 
         if (in_array($host, $this->getWhitelistedRedirectDomains())) {
-            return $url;
+            return $parsed;
         }
 
-        return $base; // Return base url for non-whitelisted domains
+        return $parsedBase; // Return base url for non-whitelisted domains
     }
 
     protected function getWhitelistedRedirectDomains(): array