From acaeb5ec41a78a7450ca7f84539d07547386f127 Mon Sep 17 00:00:00 2001
From: sam marshall <s.marshall@open.ac.uk>
Date: Tue, 24 Apr 2018 12:08:35 +0100
Subject: [PATCH] MDL-61028 core_search: Fix SELECT bug affecting Oracle

---
 lib/classes/user.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/classes/user.php b/lib/classes/user.php
index ce986c926ca..89ba7b5d81c 100644
--- a/lib/classes/user.php
+++ b/lib/classes/user.php
@@ -261,7 +261,7 @@ class core_user {
         if (!in_array('deleted', $extra)) {
             $extrafieldlist[] = 'deleted';
         }
-        $extrafields = \user_picture::fields('u',
+        $selectfields = \user_picture::fields('u',
                 array_merge(get_all_user_name_fields(), $extrafieldlist));
 
         $index = 1;
@@ -327,7 +327,7 @@ class core_user {
         $readcount = $max + 2;
         for ($i = 0; $i < $querylimit; $i++) {
             $rawresult = $DB->get_records_sql("
-                    SELECT users.*, $extrafields
+                    SELECT $selectfields
                       FROM ($userquery) users
                       JOIN {user} u ON u.id = users.id
                      WHERE $where
-- 
2.17.1