Merge branch 'MDL-45381_master' of git://github.com/markn86/moodle

moodle · Jul 8, 2014 · 79269b0 · 79269b0
2 parents 772d658 + 05c0d19
commit 79269b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/mod/forum/classes/event/subscription_created.php b/mod/forum/classes/event/subscription_created.php
@@ -77,7 +77,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/mod/forum/view.php', array('f' => $this->other['forumid']));
+        return new \moodle_url('/mod/forum/subscribers.php', array('id' => $this->other['forumid']));
     }
 
     /**

diff --git a/mod/forum/classes/event/subscription_deleted.php b/mod/forum/classes/event/subscription_deleted.php
@@ -77,7 +77,7 @@ public static function get_name() {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/mod/forum/view.php', array('f' => $this->other['forumid']));
+        return new \moodle_url('/mod/forum/subscribers.php', array('id' => $this->other['forumid']));
     }
 
     /**

diff --git a/mod/forum/tests/events_test.php b/mod/forum/tests/events_test.php
@@ -662,7 +662,7 @@ public function test_subscription_created() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'forum', 'subscribe', "view.php?f={$forum->id}", $forum->id, $forum->cmid);
         $this->assertEventLegacyLogData($expected, $event);
-        $url = new \moodle_url('/mod/forum/view.php', array('f' => $forum->id));
+        $url = new \moodle_url('/mod/forum/subscribers.php', array('id' => $forum->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);
 
@@ -759,7 +759,7 @@ public function test_subscription_deleted() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'forum', 'unsubscribe', "view.php?f={$forum->id}", $forum->id, $forum->cmid);
         $this->assertEventLegacyLogData($expected, $event);
-        $url = new \moodle_url('/mod/forum/view.php', array('f' => $forum->id));
+        $url = new \moodle_url('/mod/forum/subscribers.php', array('id' => $forum->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);