Whoops ... using forum->assessed to determine whether discussions should

be assessable now

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index f73ae0a4409cc3811ff658801e24f26d6cf8dbac..b6090c46cea06c7b6893e79874db8f0b1ae2d9a4 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -66,7 +66,7 @@
                  "$navmiddle -> $navtail", "", "", true, $updatebutton);
     }
 
-    forum_print_discussion($course, $discussion, $post, $USER->mode);
+    forum_print_discussion($course, $forum, $discussion, $post, $USER->mode);
 
     print_footer($course);
 

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 523bc0a9bd2c195683b66059378ef39b1e6def25..91ce379a7bb8395c6062fd4fdc04a72994c0418f 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -862,7 +862,7 @@ function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5, $f
     }
 }
 
-function forum_print_discussion($course, $discussion, $post, $mode) {
+function forum_print_discussion($course, $forum, $discussion, $post, $mode) {
 
     global $USER;
 
@@ -872,7 +872,7 @@ function forum_print_discussion($course, $discussion, $post, $mode) {
 
     forum_print_mode_form($discussion->id, $mode);
 
-    if ($discussion->assessed && $USER->id) {
+    if ($forum->assessed && $USER->id) {
         echo "<FORM NAME=form METHOD=POST ACTION=rate.php>";
         echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\">";
     }
@@ -895,7 +895,7 @@ function forum_print_discussion($course, $discussion, $post, $mode) {
             break;
     }
 
-    if ($discussion->assessed && $USER->id) {
+    if ($forum->assessed && $USER->id) {
         echo "<CENTER><P ALIGN=center><INPUT TYPE=submit VALUE=\"".get_string("sendinratings", "forum")."\"></P></CENTER>";
         echo "</FORM>";
     }

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 2e1553e21b0d252be351287143303986db7b779a..a1c1dcfb9ac78f1a547aac424d46874a0df05706 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -104,7 +104,7 @@
                 error("Could not find the first post in this forum");
             }
             forum_set_display_mode($mode);
-            forum_print_discussion($course, $discussion, $post, $USER->mode);
+            forum_print_discussion($course, $forum, $discussion, $post, $USER->mode);
             break;
 
         case "eachuser":