diff --git a/course/tests/courselib_test.php b/course/tests/courselib_test.php index b28522e4fb9..1935ec79a56 100644 --- a/course/tests/courselib_test.php +++ b/course/tests/courselib_test.php @@ -1534,6 +1534,10 @@ class core_course_courselib_testcase extends advanced_testcase { $this->assertEquals($coursecontext->id, $event->contextid); $this->assertEquals($course, $event->get_record_snapshot('course', $course->id)); $this->assertEquals('course_deleted', $event->get_legacy_eventname()); + $eventdata = $event->get_data(); + $this->assertSame($course->idnumber, $eventdata['other']['idnumber']); + $this->assertSame($course->fullname, $eventdata['other']['fullname']); + $this->assertSame($course->shortname, $eventdata['other']['shortname']); // The legacy data also passed the context in the course object. $course->context = $coursecontext; $this->assertEventLegacyData($course, $event); diff --git a/lib/classes/event/course_deleted.php b/lib/classes/event/course_deleted.php index db17175afc5..0f704a77b53 100644 --- a/lib/classes/event/course_deleted.php +++ b/lib/classes/event/course_deleted.php @@ -71,7 +71,7 @@ class course_deleted extends base { protected function get_legacy_eventdata() { $course = $this->get_record_snapshot('course', $this->objectid); $course->context = $this->context; - + $course->timemodified = $this->data['timecreated']; return $course; } diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 3977dbee67f..2cf904a3888 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -4852,10 +4852,6 @@ function delete_course($courseorid, $showfeedback = true) { // Delete the course and related context instance. context_helper::delete_instance(CONTEXT_COURSE, $courseid); - // We will update the course's timemodified, as it will be passed to the course_deleted event, - // which should know about this updated property, as this event is meant to pass the full course record. - $course->timemodified = time(); - $DB->delete_records("course", array("id" => $courseid)); $DB->delete_records("course_format_options", array("courseid" => $courseid)); @@ -4863,8 +4859,11 @@ function delete_course($courseorid, $showfeedback = true) { $event = \core\event\course_deleted::create(array( 'objectid' => $course->id, 'context' => $context, - 'other' => array('shortname' => $course->shortname, - 'fullname' => $course->fullname) + 'other' => array( + 'shortname' => $course->shortname, + 'fullname' => $course->fullname, + 'idnumber' => $course->idnumber + ) )); $event->add_record_snapshot('course', $course); $event->trigger();