MDL-17808 more lastname support when resetting passwords; merged from MOODLE_19_STABLE

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 2bff0679eb082f5dddd1f1396e16b17b978aa2da..6afaae840137dab2e69e9f96360cf5ccf7c18117 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4352,12 +4352,13 @@ function reset_password_and_mail($user) {
     }
 
     $a = new object();
-    $a->firstname = $user->firstname;
-    $a->sitename = format_string($site->fullname);
-    $a->username = $user->username;
+    $a->firstname   = $user->firstname;
+    $a->lastname    = $user->lastname;
+    $a->sitename    = format_string($site->fullname);
+    $a->username    = $user->username;
     $a->newpassword = $newpassword;
-    $a->link = $CFG->httpswwwroot .'/login/change_password.php';
-    $a->signoff = generate_email_signoff();
+    $a->link        = $CFG->httpswwwroot .'/login/change_password.php';
+    $a->signoff     = generate_email_signoff();
 
     $message = get_string('newpasswordtext', '', $a);
 
@@ -4443,6 +4444,7 @@ function send_password_change_info($user) {
 
     $data = new object();
     $data->firstname = $user->firstname;
+    $data->lastname  = $user->lastname;
     $data->sitename  = format_string($site->fullname);
     $data->admin     = generate_email_signoff();