Permalink
Browse files

Merge branch 'MDL-61236-33' of git://github.com/farhan6318/moodle int…

…o MOODLE_33_STABLE
  • Loading branch information...
dmonllao committed Feb 12, 2018
2 parents 235d4be + 055010a commit 8904b10b444f91f5bec5925472c38694aee3d232
Showing with 3 additions and 2 deletions.
  1. +3 −2 enrol/self/lib.php
@@ -1031,8 +1031,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]));
}

0 comments on commit 8904b10

Please sign in to comment.