MDL-13302 gradebook data deleted now in remove_course_contents() - it…

… makes better sense to have it there; merged from MOODLE_19_STABLE

lib/moodlelib.php

@@ -3370,26 +3370,20 @@ function set_login_session_preferences() {
  */
 function delete_course($courseid, $showfeedback = true) {
     global $CFG;
-    require_once($CFG->libdir.'/gradelib.php');
     $result = true;
 
     // frontpage course can not be deleted!!
     if ($courseid == SITEID) {
         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.");
         }
         $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.");
@@ -3429,7 +3423,8 @@ function delete_course($courseid, $showfeedback = true) {
 function remove_course_contents($courseid, $showfeedback=true) {
 
     global $CFG;
-    include_once($CFG->libdir.'/questionlib.php');
+    require_once($CFG->libdir.'/questionlib.php');
+    require_once($CFG->libdir.'/gradelib.php');
 
     $result = true;
 
@@ -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;
 }