Skip to content

Commit

Permalink
MDL-44055 mod_quiz: Add missing alternate name fields
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewnicols committed Feb 11, 2014
1 parent 27ebbdd commit 4ba46b8
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions mod/quiz/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 4ba46b8

Please sign in to comment.