Merge remote-tracking branch 'upstream/5.3-dev' into 5.4-upmerge-2025-04-08

Author: muhme

libraries/src/Application/MultiFactorAuthenticationHandler.php

@@ -271,11 +271,6 @@ private function needsMultiFactorAuthenticationRedirection(): bool
             return false;
         }
 
-        // Do not redirect if we are already in a MFA management or captive page
-        if ($this->isMultiFactorAuthenticationPage()) {
-            return false;
-        }
-
         $option       = strtolower($this->input->getCmd('option', ''));
         $task         = strtolower($this->input->getCmd('task', ''));
 
@@ -294,6 +289,13 @@ private function needsMultiFactorAuthenticationRedirection(): bool
             return false;
         }
 
+        // Do not redirect if we are already in a MFA management or captive page
+        $onlyCaptive = $this->isMultiFactorAuthenticationPending() && !$isMFASetupMandatory;
+
+        if ($this->isMultiFactorAuthenticationPage($onlyCaptive)) {
+            return false;
+        }
+
         return true;
     }