mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-75208' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2022-07-21 11:26:52 +08:00
commit c5e19c2ba6
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
course/lib.php
View File

@ -2470,9 +2470,7 @@ function update_course($data, $editoroptions = NULL) {
function average_number_of_participants(bool $onlyactive = false, int $lastloginsince = null): float {
global $DB;
$params = [
'siteid' => SITEID,
];
$params = [];
$sql = "SELECT DISTINCT ue.userid, e.courseid
FROM {user_enrolments} ue
@ -2483,8 +2481,7 @@ function average_number_of_participants(bool $onlyactive = false, int $lastlogin
$sql .= "JOIN {user} u ON u.id = ue.userid ";
}
$sql .= "WHERE e.courseid <> :siteid
AND c.visible = 1 ";
$sql .= "WHERE e.courseid <> " . SITEID . " AND c.visible = 1 ";
if ($onlyactive) {
$sql .= "AND ue.status = :active

8
lib/enrollib.php
View File

@ -688,8 +688,8 @@ function enrol_get_my_courses($fields = null, $sort = null, $limit = 0, $coursei
$orderby = "ORDER BY $sort";
}
$wheres = array("c.id <> :siteid");
$params = array('siteid'=>SITEID);
$wheres = ['c.id <> ' . SITEID];
$params = [];
if (isset($USER->loginascontext) and $USER->loginascontext->contextlevel == CONTEXT_COURSE) {
// list _only_ this course - anything else is asking for trouble...
@ -1093,7 +1093,7 @@ function enrol_get_all_users_courses($userid, $onlyactive = false, $fields = nul
$orderby = "ORDER BY $sort";
}
$params = array('siteid'=>SITEID);
$params = [];
if ($onlyactive) {
$subwhere = "WHERE ue.status = :active AND e.status = :enabled AND ue.timestart < :now1 AND (ue.timeend = 0 OR ue.timeend > :now2)";
@ -1119,7 +1119,7 @@ function enrol_get_all_users_courses($userid, $onlyactive = false, $fields = nul
$subwhere
) en ON (en.courseid = c.id)
$ccjoin
WHERE c.id <> :siteid
WHERE c.id <> " . SITEID . "
$orderby";
$params['userid'] = $userid;