mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-44055-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2014-02-17 09:04:48 +13:00
commit 9e7fb3e848
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mod/glossary/lib.php
View File

@ -364,7 +364,7 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
$params['timestart'] = $timestart;
$params['glossaryid'] = $cm->instance;
$ufields = user_picture::fields('u', array('lastaccess', 'firstname', 'lastname', 'email', 'picture', 'imagealt'));
$ufields = user_picture::fields('u');
$entries = $DB->get_records_sql("
SELECT ge.id AS entryid, ge.*, $ufields
FROM {glossary_entries} ge
@ -399,6 +399,9 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
}
$tmpactivity = new stdClass();
$tmpactivity->user = username_load_fields_from_object(new stdClass(), $entry, null,
explode(',', user_picture::fields()));
$tmpactivity->user->fullname = fullname($tmpactivity->user, $viewfullnames);
$tmpactivity->type = 'glossary';
$tmpactivity->cmid = $cm->id;
$tmpactivity->glossaryid = $entry->glossaryid;
@ -409,14 +412,6 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
$tmpactivity->content->entryid = $entry->entryid;
$tmpactivity->content->concept = $entry->concept;
$tmpactivity->content->definition = $entry->definition;
$tmpactivity->user = new stdClass();
$tmpactivity->user->id = $entry->userid;
$tmpactivity->user->firstname = $entry->firstname;
$tmpactivity->user->lastname = $entry->lastname;
$tmpactivity->user->fullname = fullname($entry, $viewfullnames);
$tmpactivity->user->picture = $entry->picture;
$tmpactivity->user->imagealt = $entry->imagealt;
$tmpactivity->user->email = $entry->email;
$activities[$index++] = $tmpactivity;
}

14
mod/quiz/lib.php
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;
}