From c39748f4b47fb747f19770101dc0a7eb419911c2 Mon Sep 17 00:00:00 2001
From: mchurch <mchurch>
Date: Thu, 28 Apr 2005 19:49:01 +0000
Subject: [PATCH] Re: Bug 3033 - fixed incorrect arguments in markposts for the
 forum index screen.

---
 mod/forum/index.php     |  4 ++--
 mod/forum/lib.php       |  2 +-
 mod/forum/markposts.php | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mod/forum/index.php b/mod/forum/index.php
index b1b643dfca8d7..76e88dc221b29 100644
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -145,7 +145,7 @@
                     $unread = forum_tp_count_forum_unread_posts($USER->id, $forum->id, $groupid);
                     if ($unread > 0) {
                         $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
-                        $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?id='.
+                        $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='.
                                        $forum->id.'&amp;mark=read"><img src="'.$CFG->pixpath.'/t/clear.gif" alt="" /></a></span>';
                     } else {
                         $unreadlink = '<span class="read"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
@@ -290,7 +290,7 @@
                         $unread = forum_tp_count_forum_unread_posts($USER->id, $forum->id, $groupid);
                         if ($unread > 0) {
                             $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
-                            $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?id='.
+                            $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='.
                                            $forum->id.'&amp;mark=read"><img src="'.$CFG->pixpath.'/t/clear.gif" alt="" /></a></span>';
                         } else {
                             $unreadlink = '<span class="read"><a href="view.php?f='.$forum->id.'">'.$unread.'</a></span>';
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 662fef18e0902..94c4ac72d7972 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1826,7 +1826,7 @@ function forum_print_discussion_header(&$post, $forum, $group=-1, $datestring=""
                     echo '<a href="'.$CFG->wwwroot.'/mod/forum/discuss.php?d='.$post->discussion.'#unread">';
                     echo $post->unread;
                     echo '</a>';
-                    echo '<a title="'.$strmarkalldread.'" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?id='.
+                    echo '<a title="'.$strmarkalldread.'" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='.
                          $forum->id.'&amp;d='.$post->discussion.'&amp;mark=read&amp;returnpage=view.php">' .
                          '<img src="'.$CFG->pixpath.'/t/clear.gif" height="11" width="11" border="0" /></a>';
                     echo '</span>';
diff --git a/mod/forum/markposts.php b/mod/forum/markposts.php
index 64e2a45ca43f2..1203da630fc76 100644
--- a/mod/forum/markposts.php
+++ b/mod/forum/markposts.php
@@ -5,12 +5,12 @@
     require_once("../../config.php");
     require_once("lib.php");
 
-    require_variable($id);                          // The forum to mark
+    require_variable($f);                           // The forum to mark
     require_variable($mark);                        // Read or unread?
     optional_variable($d);                          // Discussion to mark.
     optional_variable($returnpage, 'index.php');    // Page to return to.
 
-    if (! $forum = get_record("forum", "id", $id)) {
+    if (! $forum = get_record("forum", "id", $f)) {
         error("Forum ID was incorrect");
     }
 
@@ -49,7 +49,11 @@
         exit;
     }
 
-    $returnto = forum_go_back_to($returnpage.'?id='.$cm->id.'&f='.$forum->id);
+    if ($returnpage == 'index.php') {
+        $returnto = forum_go_back_to($returnpage.'?id='.$course->id);
+    } else {
+        $returnto = forum_go_back_to($returnpage.'?f='.$forum->id);
+    }
 
     $info->name  = fullname($user);
     $info->forum = format_string($forum->name);