moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for MDL-9617, calendar performance issues

Browse source
This commit is contained in:
toyomoyo 2007-05-04 05:24:55 +00:00
parent 3cb6bd2c35
commit 7a543c5cfb
2 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

28
calendar/lib.php
View file

@ -1236,30 +1236,12 @@ function calendar_get_default_courses($ignoreref = false) {
} }
} }
// find all course this student can view if (isset($CFG->adminseesall)) {
if ($allcourses = get_my_courses($USER->id, 'visible DESC, sortorder ASC', '*', true)) { return get_my_courses($USER->id, 'visible DESC', '*', $CFG->adminseesall);
foreach ($allcourses as $courseid => $acourse) { }
if (!$context = get_context_instance(CONTEXT_COURSE, $courseid)) { else {
continue; return get_my_courses($USER->id, 'visible DESC', '*', false);
}
// let's try to see if there is any direct assignments on this context
// one can have multiple assignments
// just use anyone that has something, or else use empty string
// i am not even sure enrolment type is needed here, seems like only the array keys are needed
// just keeping this code for safety
if ($roleassign = get_records_sql("SELECT * FROM {$CFG->prefix}role_assignments
WHERE contextid = $context->id
AND userid = $USER->id")) {
foreach ($roleassign as $rid => $rs) {
if (!empty($rs->enrol)) {
$courses[$courseid] = $rs->enrol;
break;
}
}
}
}
} }
return $courses;
} }
function calendar_preferences_button() { function calendar_preferences_button() {

4
lib/datalib.php
View file

@ -820,7 +820,9 @@ ORDER BY $sort");
} }
} }
if (!empty($USER->id) && ($USER->id == $userid)) { // MDL-9671, my courses should only get cached when '*' is chosen as the field, otherwise courses
// can not be displayed properly as cached courses might contain missing course name etc
if (!empty($USER->id) && ($USER->id == $userid) && $fields=='*') {
$USER->mycourses[$doanything] = $mycourses; $USER->mycourses[$doanything] = $mycourses;
} }