Merge branch 'MDL-42226_master' of https://github.com/markn86/moodle

robjoyce · Oct 15, 2013 · 9bb34fb · 9bb34fb
2 parents 3745472 + 5241526
commit 9bb34fb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/badges/renderer.php b/badges/renderer.php
@@ -935,10 +935,11 @@ public function __construct($hash) {
                 array('hash' => $hash), IGNORE_MISSING);
         if ($rec) {
             // Get a recipient from database.
-            $user = $DB->get_record_sql('SELECT u.id, u.lastname, u.firstname,
+            $namefields = get_all_user_name_fields(true, 'u');
+            $user = $DB->get_record_sql("SELECT u.id, $namefields,
                                                 u.email AS accountemail, b.email AS backpackemail
                         FROM {user} u LEFT JOIN {badge_backpack} b ON u.id = b.userid
-                        WHERE u.id = :userid', array('userid' => $rec->userid));
+                        WHERE u.id = :userid", array('userid' => $rec->userid));
             $this->recipient = $user;
             $this->visible = $rec->visible;
             $this->badgeid = $rec->badgeid;