mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-76074-401' of https://github.com/srobotta/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Andrew Nicols 2022-12-08 07:28:45 +08:00
commit 41b48aeea5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/completionlib.php
View File

@ -1424,14 +1424,15 @@ class completion_info {
$fieldssql = $userfieldsapi->get_sql('u', true);
$sql = 'SELECT u.id, u.idnumber ' . $fieldssql->selects;
$sql .= ' FROM (' . $enrolledsql . ') eu JOIN {user} u ON u.id = eu.id';
$sql .= $fieldssql->joins;
$params = array_merge($params, $fieldssql->params);
if ($where) {
$sql .= " AND $where";
$params = array_merge($params, $whereparams);
}
$sql .= $fieldssql->joins;
$params = array_merge($params, $fieldssql->params);
if ($sort) {
$sql .= " ORDER BY $sort";
}