MDL-12055 Tweaked forum subscribe 'continue' address

diff --git a/mod/forum/index.php b/mod/forum/index.php
index d54fc86998805bcf87cbcd76c7f9087c321dd686..6c125000b22cbb7d11e110b43c2d43d7948a8e46 100644 (file)
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -376,7 +376,7 @@
                 if ($can_subscribe) {
                     $row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes,
                         'unsubscribed' => $strno, 'forcesubscribed' => $stryes,
-                        'cantsubscribe' => '-'), $cantaccessagroup, false);
+                        'cantsubscribe' => '-'), $cantaccessagroup, false, true);
                 }
                 
                 //If this forum has RSS activated, calculate it

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index a3be13f10ee5a7dee1726949aad29c06c38ee57f..d9946eb8cff0f233e5868882a00781895c5f0276 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3299,7 +3299,7 @@ function forum_post_subscription($post) {
  *      at the top of the function.
  * @param 
  */
-function forum_get_subscribe_link($forum, $context, $messages = array(), $cantaccessagroup = false, $fakelink=true) {
+function forum_get_subscribe_link($forum, $context, $messages = array(), $cantaccessagroup = false, $fakelink=true, $backtoindex=false) {
     global $CFG, $USER;
     $defaultmessages = array(
         'subscribed' => get_string('unsubscribe', 'forum'),
@@ -3325,18 +3325,19 @@ function forum_get_subscribe_link($forum, $context, $messages = array(), $cantac
             $linktitle = get_string('subscribestart', 'forum');
         }
 
+        $backtoindexlink=($backtoindex ? '&backtoindex=1' : '');
         $link = '';
         if ($fakelink) {
             $link .= '<script type="text/javascript">';
             $link .= '//<![CDATA['."\n";
             $link .= 'document.getElementById("subscriptionlink").innerHTML = "<a title=\"' . $linktitle . '\" href=\"' . $CFG->wwwroot .
-               '/mod/forum/subscribe.php?id=' . $forum->id . '\">' . $linktext . '<\/a>";';
+               '/mod/forum/subscribe.php?id=' . $forum->id . $backtoindexlink.'\">' . $linktext . '<\/a>";';
             $link .= '//]]>';
             $link .= '</script>';
             // use <noscript> to print button in case javascript is not enabled
             $link .= '<noscript>';
         }
-        $link .= print_single_button($CFG->wwwroot . '/mod/forum/subscribe.php?id=' . $forum->id,
+        $link .= print_single_button($CFG->wwwroot . '/mod/forum/subscribe.php?id=' . $forum->id.$backtoindexlink,
                 '', $linktext, 'post', '_self', true, $linktitle);
         if ($fakelink) {
             $link .= '</noscript>';

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 05bbae678dcf3b4f175a9c8b168bac8bcdaaad25..d2ea8ca693c487f06b46b9c59d5c8e11d197e04d 100644 (file)
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -60,7 +60,9 @@
         exit;
     }
 
-    $returnto = forum_go_back_to("view.php?f=$id");
+    $returnto = optional_param('backtoindex',0,PARAM_INT) 
+        ? "index.php?id=".$course->id 
+        : "view.php?f=$id";
 
     if ($force and has_capability('mod/forum:managesubscriptions', $context)) {
         if (forum_is_forcesubscribed($forum->id)) {