Merge branch 'master-MDL-60116' of https://github.com/fwsl/moodle

This commit is contained in:
David Monllao 2017-10-19 15:54:23 +02:00
commit 3c0805b7c0
2 changed files with 2 additions and 1 deletions

View File

@ -662,7 +662,7 @@ If you continue to have difficulty, contact the site administrator.';
$string['emailpasswordchangeinfo'] = 'Hi {$a->firstname},
Someone (probably you) has requested a new password for your
account on \'{$a->sitename}\'.
account \'{$a->username}\' on \'{$a->sitename}\'.
To change your password, please go to the following web address:

View File

@ -6287,6 +6287,7 @@ function send_password_change_info($user) {
$data = new stdClass();
$data->firstname = $user->firstname;
$data->lastname = $user->lastname;
$data->username = $user->username;
$data->sitename = format_string($site->fullname);
$data->admin = generate_email_signoff();