Permalink
Browse files

Merge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle

  • Loading branch information...
danpoltawski committed Oct 29, 2013
2 parents b6df9f8 + 0d22c24 commit 7d3cdcc90dfbfd5aaead289c24b741b5bfb4a9b9
Showing with 10 additions and 7 deletions.
  1. +4 −0 course/tests/courselib_test.php
  2. +1 −1 lib/classes/event/course_deleted.php
  3. +5 −6 lib/moodlelib.php
@@ -1534,6 +1534,10 @@ public function test_course_deleted_event() {
$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);
@@ -71,7 +71,7 @@ public static function get_legacy_eventname() {
protected function get_legacy_eventdata() {
$course = $this->get_record_snapshot('course', $this->objectid);
$course->context = $this->context;
$course->timemodified = $this->data['timecreated'];
return $course;
}
View
@@ -4852,19 +4852,18 @@ 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));
// Trigger a course deleted event.
$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();

0 comments on commit 7d3cdcc

Please sign in to comment.