From 4448ddc159dabd937cba9b00e8e1765211676656 Mon Sep 17 00:00:00 2001
From: Farhan Karmali <farhan6318@gmail.com>
Date: Mon, 29 Jan 2018 21:46:23 +0530
Subject: [PATCH] MDL-61236 enrol: Course welcome message to be sent from
 correct contact

---
 enrol/self/lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/enrol/self/lib.php b/enrol/self/lib.php
index 170da243e0c..98e9583558c 100644
--- a/enrol/self/lib.php
+++ b/enrol/self/lib.php
@@ -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]));
             }