matching qtype: MDL-17496 With filterall and multilang, the contents of the dropdowns...

This was caused becuse the solution to MDL-9005 was not quite right.

diff --git a/question/type/match/questiontype.php b/question/type/match/questiontype.php
index 012b9c4998b181e394402951c59ab23b61ec12f1..7169f6b8db59b339874a139477e8008654618aac 100644 (file)
--- a/question/type/match/questiontype.php
+++ b/question/type/match/questiontype.php
@@ -177,7 +177,7 @@ class question_match_qtype extends default_questiontype {
             // answers per question, each with different marks and feedback.
             $answer = new stdClass();
             $answer->id       = $subquestion->code;
-            $answer->answer   = format_string($subquestion->answertext);
+            $answer->answer   = $subquestion->answertext;
             $answer->fraction = 1.0;
             $state->options->subquestions[$key]->options->answers[$subquestion->code] = clone($answer);
         }
@@ -243,9 +243,9 @@ class question_match_qtype extends default_questiontype {
         $subquestions   = $state->options->subquestions;
         $correctanswers = $this->get_correct_responses($question, $state);
         $nameprefix     = $question->name_prefix;
-        $answers        = array();
-        $allanswers     = array();
-        $answerids      = array();
+        $answers        = array(); // Answer choices formatted ready for output.
+        $allanswers     = array(); // This and the next used to detect identical answers
+        $answerids      = array(); // and adjust ids.
         $responses      = &$state->responses;
 
         // Prepare a list of answers, removing duplicates.
@@ -253,7 +253,7 @@ class question_match_qtype extends default_questiontype {
             foreach ($subquestion->options->answers as $ans) {
                 $allanswers[$ans->id] = $ans->answer;
                 if (!in_array($ans->answer, $answers)) {
-                    $answers[$ans->id] = $ans->answer;
+                    $answers[$ans->id] = strip_tags(format_string($ans->answer, false));
                     $answerids[$ans->answer] = $ans->id;
                 }
             }