random essay questions: MDL-8648 fix merge problem.

diff --git a/lib/questionlib.php b/lib/questionlib.php
index 76051e5e58b1f7294bd2a9a370fd0cbe043b0298..c46c77af7083ca570db1b37b2c4802c4d63092a9 100644 (file)
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -1828,7 +1828,11 @@ function get_question_image($question) {
 function question_print_comment_fields($question, $state, $prefix, $cmoptions, $caption = '') {
     global $QTYPES;
     $idprefix = preg_replace('/[^-_a-zA-Z0-9]/', '', $prefix);
-    if (!question_state_is_graded($state) && $QTYPES[$question->qtype]->is_question_manual_graded($question, $attempt->layout)) {
+    $otherquestionsinuse = '';
+    if (!empty($cmoptions->questions)) {
+        $otherquestionsinuse = $cmoptions->questions;
+    }
+    if (!question_state_is_graded($state) && $QTYPES[$question->qtype]->is_question_manual_graded($question, $otherquestionsinuse)) {
         $grade = '';
     } else {
         $grade = question_format_grade($cmoptions, $state->last_graded->grade);