L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-52334_30' of git://github.com/aolley/moodle into MOODLE_30_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2015-12-22 09:14:34 +08:00
parent db3cdb6d25 7f1c642112
commit ea78dbdf50
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/database/lib.php
+2 -2
View File
@@ -264,9 +264,9 @@ class enrol_database_plugin extends enrol_plugin {
FROM {enrol} e
JOIN {course} c ON c.id = e.courseid
JOIN {role_assignments} ra ON ra.itemid = e.id
LEFT JOIN {user_enrolments} ue ON ue.enrolid = e.id
LEFT JOIN {user_enrolments} ue ON ue.enrolid = e.id AND ue.userid = ra.userid
WHERE ra.userid = :userid AND e.enrol = 'database'";
$rs = $DB->get_recordset_sql($sql, array('userid'=>$user->id));
$rs = $DB->get_recordset_sql($sql, array('userid' => $user->id));
foreach ($rs as $instance) {
if (!$instance->cvisible and $ignorehidden) {
continue;