forgotten password: MDL-19441 Oops, I changed a language string by mistake. Undoing.

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 6d647fada6ea298301f1e1b0cc3b3de583150ce8..8a1efd15e1a95380ef344b16171d2ff44a8b8721 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -1224,7 +1224,8 @@ $string['passwordchanged'] = 'Password has been changed';
 $string['passwordconfirmchange'] = 'Confirm password change';
 $string['passwordextlink'] = 'The following link has been provided to recover your lost password. This will take you out of Moodle.';
 $string['passwordforgotten'] = 'Forgotten password';
-$string['passwordforgotteninstructions'] = 'To reset your password, submit your username or your email address below. If we can find you in the database, an email will be sent to your email address, with instructions how to get access again.';
+$string['passwordforgotteninstructions'] = 'Your details must first be found in the user database. Please enter <strong>either</strong> your username or your registered email address in the appropriate box. There is no need to enter both.';
+$string['passwordforgotteninstructions2'] = 'To reset your password, submit your username or your email address below. If we can find you in the database, an email will be sent to your email address, with instructions how to get access again.';
 $string['passwordnohelp'] = 'No help is available to find your lost password. Please contact your Moodle administrator.';
 $string['passwordrecovery'] = 'Yes, help me log in';
 $string['passwordsdiffer'] = 'These passwords do not match';

diff --git a/login/forgot_password.php b/login/forgot_password.php
index 24f831d99c525ddaddfcab4b66abab0a1f288c28..ab35085bf13cee45e644f4b3c712342c4b560bad 100644 (file)
--- a/login/forgot_password.php
+++ b/login/forgot_password.php
@@ -156,7 +156,7 @@ $PAGE->set_heading($strforgotten);
 $PAGE->set_focuscontrol('id_email');
 
 echo $OUTPUT->header();
-echo $OUTPUT->box(get_string('passwordforgotteninstructions'), 'generalbox boxwidthnormal boxaligncenter');
+echo $OUTPUT->box(get_string('passwordforgotteninstructions2'), 'generalbox boxwidthnormal boxaligncenter');
 $mform->display();
 
 echo $OUTPUT->footer();