From 6dfa18dff6b71227bbc19b43d5ab966e811d624f Mon Sep 17 00:00:00 2001
From: tjhunt <tjhunt>
Date: Tue, 17 Oct 2006 22:17:05 +0000
Subject: [PATCH] MDL-6848 - Display problem with < > characters in shortanswer
 when outputting the correct answer. Merged from MOODLE_16_STABLE.

---
 lang/en_utf8/quiz.php                  | 1 +
 question/type/shortanswer/display.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 33e15d670f5..c8c42bd8ad3 100644
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -97,6 +97,7 @@ $string['copyingfrom'] = 'Creating a copy of the question \'$a\'';
 $string['copyingquestion'] = 'Copying a question';
 $string['correct'] = 'Correct';
 $string['correctanswer'] = 'Correct answer';
+$string['correctansweris'] = 'Correct answer: $a';
 $string['correctanswerformula'] = 'Correct Answer Formula';
 $string['correctanswerlength'] = 'Significant Figures';
 $string['correctanswers'] = 'Correct answers';
diff --git a/question/type/shortanswer/display.html b/question/type/shortanswer/display.html
index 71c758f33a6..ab9f6a32664 100644
--- a/question/type/shortanswer/display.html
+++ b/question/type/shortanswer/display.html
@@ -24,6 +24,6 @@
 
 <?php if ($correctanswer) { ?>
     <div class="correctness correct">
-    <?php echo get_string('correctanswer', 'quiz').': '. $correctanswer; ?>
+    <?php print_string('correctansweris', 'quiz', s($correctanswer)); ?>
   </div>
 <?php } ?>