MDL-13302 gradebook data deleted now in remove_course_contents() - it makes better sense to have it there

This commit is contained in:
skodak
2008-02-18 23:07:44 +00:00
parent a19e31a1d6
commit acb05e1d85
+5 -5
View File
@@ -3378,8 +3378,6 @@ function delete_course($courseid, $showfeedback = true) {
return false;
}
$context = get_context_instance(CONTEXT_COURSE, $courseid);
if (!remove_course_contents($courseid, $showfeedback)) {
if ($showfeedback) {
notify("An error occurred while deleting some of the course contents.");
@@ -3387,9 +3385,6 @@ function delete_course($courseid, $showfeedback = true) {
$result = false;
}
remove_course_grades($courseid, $showfeedback);
remove_grade_letters($context, $showfeedback);
if (!delete_records("course", "id", $courseid)) {
if ($showfeedback) {
notify("An error occurred while deleting the main course record.");
@@ -3580,6 +3575,11 @@ function remove_course_contents($courseid, $showfeedback=true) {
/// Delete questions and question categories
question_delete_course($course, $showfeedback);
/// Remove all data from gradebook
$context = get_context_instance(CONTEXT_COURSE, $courseid);
remove_course_grades($courseid, $showfeedback);
remove_grade_letters($context, $showfeedback);
return $result;
}