Merge branch 'MDL-44272-master' of git://github.com/ankitagarwal/moodle

robjoyce · Mar 4, 2014 · f1284d3 · f1284d3
2 parents 3071e2b + df9a6c0
commit f1284d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/course/tests/courselib_test.php b/course/tests/courselib_test.php
@@ -1950,7 +1950,7 @@ public function test_course_module_created_event() {
         $this->assertEquals($cm->id, $event->objectid);
         $this->assertEquals($USER->id, $event->userid);
         $this->assertEquals('course_modules', $event->objecttable);
-        $url = new moodle_url('/mod/assign/view.php', array('id' => $mod->id));
+        $url = new moodle_url('/mod/assign/view.php', array('id' => $cm->id));
         $this->assertEquals($url, $event->get_url());
 
         // Test legacy data.
@@ -1963,7 +1963,7 @@ public function test_course_module_created_event() {
         $eventdata->userid     = $USER->id;
         $this->assertEventLegacyData($eventdata, $event);
 
-        $arr = array($cm->course, "course", "add mod", "../mod/assign/view.php?id=$mod->id", "assign $cm->instance");
+        $arr = array($cm->course, "course", "add mod", "../mod/assign/view.php?id=$cm->id", "assign $cm->instance");
         $this->assertEventLegacyLogData($arr, $event);
         $this->assertEventContextNotUsed($event);
 
@@ -2056,7 +2056,7 @@ public function test_course_module_updated_event() {
         $this->assertEquals($cm->id, $event->objectid);
         $this->assertEquals($USER->id, $event->userid);
         $this->assertEquals('course_modules', $event->objecttable);
-        $url = new moodle_url('/mod/forum/view.php', array('id' => $mod->id));
+        $url = new moodle_url('/mod/forum/view.php', array('id' => $cm->id));
         $this->assertEquals($url, $event->get_url());
 
         // Test legacy data.
@@ -2069,7 +2069,7 @@ public function test_course_module_updated_event() {
         $eventdata->userid     = $USER->id;
         $this->assertEventLegacyData($eventdata, $event);
 
-        $arr = array($cm->course, "course", "update mod", "../mod/forum/view.php?id=$mod->id", "forum $cm->instance");
+        $arr = array($cm->course, "course", "update mod", "../mod/forum/view.php?id=$cm->id", "forum $cm->instance");
         $this->assertEventLegacyLogData($arr, $event);
         $this->assertEventContextNotUsed($event);
     }

diff --git a/lib/classes/event/course_module_created.php b/lib/classes/event/course_module_created.php
@@ -77,7 +77,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/mod/' . $this->other['modulename'] . '/view.php', array('id' => $this->other['instanceid']));
+        return new \moodle_url('/mod/' . $this->other['modulename'] . '/view.php', array('id' => $this->objectid));
     }
 
     /**
@@ -111,7 +111,7 @@ protected function get_legacy_eventdata() {
      */
     protected function get_legacy_logdata() {
         return array ($this->courseid, "course", "add mod", "../mod/" . $this->other['modulename'] . "/view.php?id=" .
-                $this->other['instanceid'], $this->other['modulename'] . " " . $this->other['instanceid']);
+                $this->objectid, $this->other['modulename'] . " " . $this->other['instanceid']);
     }
 
     /**

diff --git a/lib/classes/event/course_module_updated.php b/lib/classes/event/course_module_updated.php
@@ -77,7 +77,7 @@ public function get_description() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/mod/' . $this->other['modulename'] . '/view.php', array('id' => $this->other['instanceid']));
+        return new \moodle_url('/mod/' . $this->other['modulename'] . '/view.php', array('id' => $this->objectid));
     }
 
     /**
@@ -111,7 +111,7 @@ protected function get_legacy_eventdata() {
      */
     protected function get_legacy_logdata() {
         return array ($this->courseid, "course", "update mod", "../mod/" . $this->other['modulename'] . "/view.php?id=" .
-                $this->other['instanceid'], $this->other['modulename'] . " " . $this->other['instanceid']);
+                $this->objectid, $this->other['modulename'] . " " . $this->other['instanceid']);
     }
 
     /**