Index: mod/quiz/locallib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/quiz/locallib.php,v
retrieving revision 1.127.2.16
diff -u -r1.127.2.16 locallib.php
--- mod/quiz/locallib.php	30 Sep 2009 10:58:04 -0000	1.127.2.16
+++ mod/quiz/locallib.php	23 Nov 2009 21:01:57 -0000
@@ -646,7 +646,7 @@
     $options->correct_responses = $options->readonly && ($reviewoptions & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_IMMEDIATELY);
 
     // Show general feedback if the question has been graded and the quiz allows it.
-    $options->generalfeedback = question_state_is_graded($state) && ($reviewoptions & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_IMMEDIATELY);
+    $options->generalfeedback = 0;//question_state_is_graded($state) && ($reviewoptions & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_IMMEDIATELY);
 
     // Show overallfeedback once the attempt is over.
     $options->overallfeedback = false;
Index: question/preview.php
===================================================================
RCS file: /cvsroot/moodle/moodle/question/preview.php,v
retrieving revision 1.23.2.5
diff -u -r1.23.2.5 preview.php
--- question/preview.php	10 Dec 2008 06:22:04 -0000	1.23.2.5
+++ question/preview.php	23 Nov 2009 21:03:57 -0000
@@ -181,7 +181,11 @@
     }
 
     // TODO: should not use quiz-specific function here
-    $options = quiz_get_renderoptions($quiz->review, $curstate);
+    if (question_state_is_closed($curstate)) {
+        $options = quiz_get_reviewoptions($quiz,$attempt);
+    } else {
+        $options = quiz_get_renderoptions($quiz->review, $curstate);
+    }
     $options->noeditlink = true;
 
     // Fill in the correct responses (unless the question is in readonly mode)