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

2018-11-05 13:11:17 +01:00
parent 0422a13c90 d9714b1ff9
commit e572007248
1 changed files with 8 additions and 0 deletions
@@ -79,6 +79,14 @@ if (!empty($data) || (!empty($p) && !empty($s))) {
            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"));