MDL-44055 mod_quiz: Add missing alternate name fields

This commit is contained in:
Andrew Nicols
2014-02-11 09:55:38 +08:00
parent 974c2cdc03
commit 3047f140de
+5 -9
View File
@@ -847,9 +847,10 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart,
$params['timestart'] = $timestart;
$params['quizid'] = $quiz->id;
$ufields = user_picture::fields('u');
if (!$attempts = $DB->get_records_sql("
SELECT qa.*,
u.firstname, u.lastname, u.email, u.picture, u.imagealt
{$ufields}
FROM {quiz_attempts} qa
JOIN {user} u ON u.id = qa.userid
$groupjoin
@@ -919,14 +920,9 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart,
$tmpactivity->content->maxgrade = null;
}
$tmpactivity->user = new stdClass();
$tmpactivity->user->id = $attempt->userid;
$tmpactivity->user->firstname = $attempt->firstname;
$tmpactivity->user->lastname = $attempt->lastname;
$tmpactivity->user->fullname = fullname($attempt, $viewfullnames);
$tmpactivity->user->picture = $attempt->picture;
$tmpactivity->user->imagealt = $attempt->imagealt;
$tmpactivity->user->email = $attempt->email;
$tmpactivity->user = username_load_fields_from_object(new stdClass(), $attempt, null,
explode(',', user_picture::fields()));
$tmpactivity->user->fullname = fullname($tmpactivity->user, $viewfullnames);
$activities[$index++] = $tmpactivity;
}