Merge branch 'MDL-24394_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

2012-01-10 14:30:22 +13:00
parent 10c3c6d49c c4989dc75f
commit 859624f26c
1 changed files with 2 additions and 1 deletions
@@ -108,7 +108,8 @@ class qtype_match_renderer extends qtype_with_combined_feedback_renderer {
    protected function format_choices($question) {
        $choices = array();
        foreach ($question->get_choice_order() as $key => $choiceid) {
-            $choices[$key] = htmlspecialchars($question->choices[$choiceid]);
+            $choices[$key] = format_string($question->choices[$choiceid], true,
+                    array('context' => $question->contextid));
        }
        return $choices;
    }