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

andelacruz · May 12, 2017 · 0e01f68 · 0e01f68
2 parents 3227ac8 + 5ffe41b
commit 0e01f68
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/auth/oauth2/confirm-account.php b/auth/oauth2/confirm-account.php
@@ -85,7 +85,7 @@
     echo $OUTPUT->footer();
     exit;
 } else {
-    print_error('invalidconfirmdata');
+    \core\notification::error(get_string('confirmationinvalid', 'auth_oauth2'));
 }
 
 redirect("$CFG->wwwroot/");
diff --git a/auth/oauth2/confirm-linkedlogin.php b/auth/oauth2/confirm-linkedlogin.php
@@ -72,7 +72,7 @@
     echo $OUTPUT->footer();
     exit;
 } else {
-    print_error('invalidconfirmdata');
+    \core\notification::error(get_string('confirmationinvalid', 'auth_oauth2'));
 }
 
 redirect("$CFG->wwwroot/");
diff --git a/auth/oauth2/lang/en/auth_oauth2.php b/auth/oauth2/lang/en/auth_oauth2.php
@@ -42,6 +42,7 @@
 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},