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

2018-02-12 12:14:23 +01:00
parent eadb6a737e 4448ddc159
commit fc649d6700
1 changed files with 3 additions and 2 deletions
@@ -1003,8 +1003,9 @@ class enrol_self_plugin extends enrol_plugin {
                // 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]));
            }