SC 299. Merged from MOODLE_16_STABLE.

diff --git a/question/type/essay/questiontype.php b/question/type/essay/questiontype.php
index 0fc3331e28ede38751876635694224c1fb834ff8..017db8885b8fa235f9be22c082a5c47dd54e6bf5 100644 (file)
--- a/question/type/essay/questiontype.php
+++ b/question/type/essay/questiontype.php
@@ -87,8 +87,10 @@ class question_essay_qtype extends default_questiontype {
             $answer = print_textarea($usehtmleditor, 18, 80, 630, 400, $inputname, $value, $cmoptions->course, true);
         } else {
             // it is read only, so just format the students answer and output it
-            $answer = format_text($value, $question->questiontextformat,
-                                  $formatoptions, $cmoptions->course);
+            $safeformatoptions = new stdClass;
+            $safeformatoptions->para = false;
+            $answer = format_text($value, FORMAT_MOODLE,
+                                  $safeformatoptions, $cmoptions->course);
         }
         
         include("$CFG->dirroot/question/type/essay/display.html");