MDL-9481 Prevent redirection to alt login url after login (when url on the same server)

diff --git a/login/index.php b/login/index.php
index e9099e5a2256745679292dbcebfcc4dc39283255..8c6484147257228031e44c55bccbff1bb6433daa 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -278,6 +278,11 @@ httpsrequired();
     if (!empty($CFG->alternateloginurl)) {
         $loginurl = $CFG->alternateloginurl;
 
+        if (strpos($SESSION->wantsurl, $loginurl) === 0) {
+            //we do not want to return to alternate url
+            $SESSION->wantsurl = NULL;
+        }
+
         if ($errorcode) {
             if (strpos($loginurl, '?') === false) {
                 $loginurl .= '?';