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

fixed a bug where block instances aren't deleted properly

Browse Source
This commit is contained in:
toyomoyo 2006-10-04 02:43:11 +00:00
parent e020c546c7
commit 7f8691201c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/moodlelib.php
View File

@ -2696,7 +2696,11 @@ function remove_course_contents($courseid, $showfeedback=true) {
notify_local_delete_course($courseid, $showfeedback);
/// Delete course blocks
if ($blocks = get_records('block_instance', 'pagetype', PAGE_COURSE_VIEW, 'pageid', $course->id)) {
if ($blocks = get_records_sql("SELECT *
FROM {$CFG->prefix}block_instance
WHERE pagetype = '".PAGE_COURSE_VIEW."'
AND pageid = $course->id")) {
if (delete_records('block_instance', 'pagetype', PAGE_COURSE_VIEW, 'pageid', $course->id)) {
if ($showfeedback) {
notify($strdeleted .' block_instance');
@ -2781,10 +2785,7 @@ function remove_course_contents($courseid, $showfeedback=true) {
question_delete_course($course, $showfeedback);
/// Delete all roles and overiddes in the course context (but keep the course context)
if ($context = get_context_instance(CONTEXT_COURSE, $course->id)) {
delete_records('role_assignments', 'contextid', $context->id);
delete_records('role_capabilities', 'contextid', $context->id);
}
delete_context(CONTEXT_COURSE, $course->id);
return $result;
}