moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-45676_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

Browse source
This commit is contained in:
Dan Poltawski 2014-05-26 12:02:43 +01:00
commit c5549ab475
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/data/preset.php
View file

@ -61,7 +61,8 @@ $presets = data_get_available_presets($context);
$strdelete = get_string('deleted', 'data'); $strdelete = get_string('deleted', 'data');
foreach ($presets as &$preset) { foreach ($presets as &$preset) {
if (!empty($preset->userid)) { if (!empty($preset->userid)) {
$presetuser = $DB->get_record('user', array('id'=>$preset->userid), 'id,firstname,lastname', MUST_EXIST); $namefields = get_all_user_name_fields(true);
$presetuser = $DB->get_record('user', array('id' => $preset->userid), 'id, ' . $namefields, MUST_EXIST);
$preset->description = $preset->name.' ('.fullname($presetuser, true).')'; $preset->description = $preset->name.' ('.fullname($presetuser, true).')';
} else { } else {
$preset->userid = 0; $preset->userid = 0;