mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

MDL-61028 core_search: Fix SELECT bug affecting Oracle

Browse Source
This commit is contained in:
sam marshall 2018-04-24 12:08:35 +01:00 committed by David Monllao
parent ac8f106b4d
commit acaeb5ec41
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/user.php
View File

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