From 9fc9de91beecb5f8572271fa1132c86bc6499f1a Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Thu, 11 Nov 2010 01:49:58 +0000
Subject: [PATCH] enrol-users MDL-24618 Enrol users search now concats
 firstname and lastname as requested and searches email.

---
 enrol/ajax.php     | 2 +-
 enrol/locallib.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/enrol/ajax.php b/enrol/ajax.php
index 81c0ede4719..44db51577af 100644
--- a/enrol/ajax.php
+++ b/enrol/ajax.php
@@ -126,7 +126,7 @@ switch ($action) {
         $enrolid = required_param('enrolid', PARAM_INT);
         $search  = optional_param('search', '', PARAM_RAW);
         $page = optional_param('page', 0, PARAM_INT);
-        $outcome->response = $manager->get_potential_users($enrolid, $search, false, $page);
+        $outcome->response = $manager->get_potential_users($enrolid, $search, true, $page);
         foreach ($outcome->response['users'] as &$user) {
             $user->picture = $OUTPUT->user_picture($user);
             $user->fullname = fullname($user);
diff --git a/enrol/locallib.php b/enrol/locallib.php
index 54c6b6e7cd2..4f1669ce7ec 100644
--- a/enrol/locallib.php
+++ b/enrol/locallib.php
@@ -263,7 +263,10 @@ class course_enrolment_manager {
         $tests = array("id <> :guestid", 'u.deleted = 0', 'u.confirmed = 1');
         $params = array('guestid' => $CFG->siteguest);
         if (!empty($search)) {
-            $conditions = array('u.firstname','u.lastname');
+            $conditions = array(
+                $DB->sql_concat('u.firstname', "' '", 'u.lastname'),
+                'u.email'
+            );
             if ($searchanywhere) {
                 $searchparam = '%' . $search . '%';
             } else {
-- 
2.17.1