Merge branch 'MDL-59929' of git://github.com/timhunt/moodle

This commit is contained in:
Dan Poltawski 2017-09-12 10:54:11 +01:00
commit 68e3c5f71b
2 changed files with 5 additions and 1 deletions

View file

@ -887,7 +887,9 @@ function signup_validate_data($data, $files) {
$errors['email'] = get_string('invalidemail');
} else if ($DB->record_exists('user', array('email' => $data['email']))) {
$errors['email'] = get_string('emailexists').' <a href="forgot_password.php">'.get_string('newpassword').'?</a>';
$errors['email'] = get_string('emailexists') . ' ' .
get_string('emailexistssignuphint', 'moodle',
html_writer::link(new moodle_url('/login/forgot_password.php'), get_string('emailexistshintlink')));
}
if (empty($data['email2'])) {
$errors['email2'] = get_string('missingemail');