MDL-10680:

subquestions/subanswers needed swapped for matching questions

Merged from STABLE_18

diff --git a/question/format/webct/format.php b/question/format/webct/format.php
index f2ed85e32bb5738976655d9692a24803d236bfe2..cb9742d2002ffea1a04f3323a679288809a41d9d 100644 (file)
--- a/question/format/webct/format.php
+++ b/question/format/webct/format.php
@@ -166,8 +166,8 @@ class qformat_webct extends qformat_default {
     }
 
     function readquestions ($lines) {
-   global $QTYPES ;
-      //  $qtypecalculated = new qformat_webct_modified_calculated_qtype();
+        global $QTYPES ;
+        //  $qtypecalculated = new qformat_webct_modified_calculated_qtype();
         $webctnumberregex =
                 '[+-]?([0-9]+(\\.[0-9]*)?|\\.[0-9]+)((e|E|\\*10\\*\\*)([+-]?[0-9]+|\\([+-]?[0-9]+\\)))?';
 
@@ -348,6 +348,13 @@ class qformat_webct extends qformat_default {
                                 unset($question->answer); //not used in calculated question
                                 break;
                             case MATCH:
+                                // MDL-10680:
+                                // switch subquestions and subanswers
+                                foreach ($question->subquestions as $id=>$subquestion) {
+                                    $temp = $question->subquestions[$id];
+                                    $question->subquestions[$id] = $question->subanswers[$id];
+                                    $question->subanswers[$id] = $temp; 
+                                }
                                 if (count($question->answer) < 3){
                                     // add a dummy missing question
                                     $question->name = 'Dummy question added '.$question->name ;