Merge branch '3.0'

zikula · Sep 20, 2021 · 41900dd · 41900dd
2 parents c5ca20f + d5909c9
commit 41900dd
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/system/UsersModule/Controller/AccessController.php b/src/system/UsersModule/Controller/AccessController.php
@@ -221,6 +221,10 @@ private function sanitizeReturnUrl(Request $request, $returnUrl = null)
             return $returnUrl;
         }
 
+        if (false !== mb_strpos($returnUrl, $request->getUriForPath(''))) {
+            return $returnUrl;
+        }
+
         if ('/' !== mb_substr($returnUrl, 0, 1)) {
             $returnUrl = '/' . $returnUrl;
         }