matching qtype: MDL-17496 With filterall and multilang, the contents …

…of the dropdowns was not being properly filtered

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

question/type/match/questiontype.php

@@ -173,7 +173,7 @@ function restore_session_and_responses(&$question, &$state) {
             // 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);
@@ -223,7 +223,7 @@ function print_question_formulation_and_controls(&$question, &$state, $cmoptions
 
         foreach ($subquestions as $subquestion) {
             foreach ($subquestion->options->answers as $ans) {
-                $answers[$ans->id] = $ans->answer;
+                $answers[$ans->id] = strip_tags(format_string($ans->answer, false));
             }
         }