In confirmation emails, use fullname()

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 5001c8d85853eecb70cce0adb1e54396716bee6c..ec965e17e0a88e4a418a5add3d2018d30698a155 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2771,7 +2771,7 @@ function reset_password_and_mail($user) {
     $site = get_site();
     $from = get_admin();
 
-    $data->firstname = $user->firstname;
+    $data->firstname = fullname($user);
     $data->sitename = $site->fullname;
     $data->link = $CFG->wwwroot .'/login/confirm.php?p='. $user->secret .'&s='. $user->username;
     $data->admin = fullname($from) .' ('. $from->email .')';