Merge branch 'MDL-63748-master' of git://github.com/jleyva/moodle

moodle · Nov 5, 2018 · e572007 · e572007
2 parents 0422a13 + d9714b1
commit e572007
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/login/confirm.php b/login/confirm.php
@@ -79,6 +79,14 @@
             complete_user_login($user);
 
             \core\session\manager::apply_concurrent_login_limit($user->id, session_id());
+
+            // Check where to go, $redirect has a higher preference.
+            if (!empty($redirect)) {
+                if (!empty($SESSION->wantsurl)) {
+                    unset($SESSION->wantsurl);
+                }
+                redirect($redirect);
+            }
         }
 
         $PAGE->navbar->add(get_string("confirmed"));