MDL-6848 - Display problem with < > characters in shortanswer when outputting the correct answer. Merged from MOODLE_16_STABLE.

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';

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 } ?>