Skip to content

Commit

Permalink
Merge branch 'MDL-61236-master' of git://github.com/farhan6318/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Feb 12, 2018
2 parents 132106b + 4fd0bdb commit adc3c06
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions enrol/self/lib.php
Expand Up @@ -1003,8 +1003,9 @@ public function get_welcome_email_contact($sendoption, $context) {
// We only use the first user.
$i = 0;
do {
$rusers = get_role_users($croles[$i], $context, true, '',
'r.sortorder ASC, ' . $sort, null, '', '', '', '', $sortparams);
$allnames = get_all_user_name_fields(true, 'u');
$rusers = get_role_users($croles[$i], $context, true, 'u.id, u.confirmed, u.username, '. $allnames . ',
u.email, r.sortorder, ra.id', 'r.sortorder, ra.id ASC, ' . $sort, null, '', '', '', '', $sortparams);
$i++;
} while (empty($rusers) && !empty($croles[$i]));
}
Expand Down

0 comments on commit adc3c06

Please sign in to comment.