Permalink
Browse files

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

…o MOODLE_34_STABLE
  • Loading branch information...
dmonllao committed Feb 12, 2018
2 parents eadb6a7 + 4448ddc commit fc649d67001f07a16e2da0f9d4e7431c97087828
Showing with 3 additions and 2 deletions.
  1. +3 −2 enrol/self/lib.php
@@ -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]));
}

0 comments on commit fc649d6

Please sign in to comment.