Bug #3481 - wildcard problem in cloze question. Thanks to Joseph Rezeau. Merged from...

diff --git a/question/type/multianswer/questiontype.php b/question/type/multianswer/questiontype.php
index 0dd0396333cfb1c16877718d70141d8d5ece8ca5..3b841fd004b0969552d967ce670233fd6fc2b03a 100644 (file)
--- a/question/type/multianswer/questiontype.php
+++ b/question/type/multianswer/questiontype.php
@@ -234,32 +234,14 @@ class embedded_cloze_qtype extends default_questiontype {
                 $chosenanswer = null;
                 switch ($wrapped->qtype) {
                     case 'numerical':
-                        $testedstate = clone($state);
-                        $testedstate->responses[''] = $response;
-                        $raw_grade   = 0;
-                        foreach ($answers as $answer) {
-                            if($QTYPES[$wrapped->qtype]
-                             ->test_response($wrapped, $testedstate, $answer)) {
-                                if (empty($raw_grade) || $raw_grade < $answer->fraction) {
-                                    $chosenanswer = clone($answer);
-                                    $raw_grade = $answer->fraction;
-                                }
-                            }
-                        }
-                        break;
                     case 'shortanswer':
                         $testedstate = clone($state);
                         $testedstate->responses[''] = $response;
-                        $teststate   = clone($state);
-                        $raw_grade   = 0;
                         foreach ($answers as $answer) {
-                            $teststate->responses[''] = trim($answer->answer);
                             if($QTYPES[$wrapped->qtype]
-                             ->compare_responses($wrapped, $testedstate, $teststate)) {
-                                if (empty($raw_grade) || $raw_grade < $answer->fraction) {
-                                    $chosenanswer = clone($answer);
-                                    $raw_grade = $answer->fraction;
-                                }
+                                    ->test_response($wrapped, $testedstate, $answer)) {
+                                $chosenanswer = clone($answer);
+                                break;
                             }
                         }
                         break;