Merge branch 'MOODLE_311_MDL-71254' of https://github.com/golenkovm/moodle into MOODLE_311_STABLE

This commit is contained in:
Andrew Nicols
2021-04-16 08:06:22 +01:00
committed by Víctor Déniz
+6 -4
View File
@@ -34,11 +34,12 @@ $error = optional_param('error', '', PARAM_RAW);
if ($error) {
$message = optional_param('error_description', '', PARAM_RAW);
if ($message) {
print_error($message);
$SESSION->loginerrormsg = $message;
redirect(new moodle_url(get_login_url()));
} else {
print_error($error);
$SESSION->loginerrormsg = $error;
redirect(new moodle_url(get_login_url()));
}
die();
}
// The authorization code generated by the authorization server.
@@ -53,5 +54,6 @@ if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
$redirecturl->param('oauth2code', $code);
redirect($redirecturl);
} else {
print_error('invalidsesskey');
$SESSION->loginerrormsg = get_string('invalidsesskey', 'error');
redirect(new moodle_url(get_login_url()));
}