mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-58899-master' of https://github.com/snake/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2017-05-12 12:00:52 +08:00
commit 0e01f68e3c
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/oauth2/confirm-account.php
View File

@ -85,7 +85,7 @@ if ($confirmed == AUTH_CONFIRM_ALREADY) {
echo $OUTPUT->footer();
exit;
} else {
print_error('invalidconfirmdata');
\core\notification::error(get_string('confirmationinvalid', 'auth_oauth2'));
}
redirect("$CFG->wwwroot/");

2
auth/oauth2/confirm-linkedlogin.php
View File

@ -72,7 +72,7 @@ if ($confirmed) {
echo $OUTPUT->footer();
exit;
} else {
print_error('invalidconfirmdata');
\core\notification::error(get_string('confirmationinvalid', 'auth_oauth2'));
}
redirect("$CFG->wwwroot/");

1
auth/oauth2/lang/en/auth_oauth2.php
View File

@ -42,6 +42,7 @@ line at the top of your web browser window.
If you need help, please contact the site administrator,
{$a->admin}';
$string['confirmaccountemailsubject'] = '{$a}: account confirmation';
$string['confirmationinvalid'] = 'The confirmation link is either invalid, or has expired. Please start the login process again to generate a new confirmation email.';
$string['confirmationpending'] = 'This account is pending email confirmation.';
$string['confirmlinkedloginemail'] = 'Hi {$a->fullname},