MDL-8563

$question->answer was swapped for $question->correctanswer in questiontype
for some reason! Compensated for in format type.

diff --git a/question/format/gift/format.php b/question/format/gift/format.php
index e719ab84c6a3bb8b2cbc98654ee90943ec208828..e2c90bcb54bd4fe9d0bb080ee39e44772556ebba 100755 (executable)
--- a/question/format/gift/format.php
+++ b/question/format/gift/format.php
@@ -363,8 +363,8 @@ class qformat_gift extends qformat_default {
                     $question->feedbacktrue = $feedback['wrong'];
                 }
 
-                //$question->defaultgrade = 1;
-                //$question->image = "";   // No images with this format
+                $question->correctanswer = $question->answer;
+
                 return $question;
                 break;
                 

diff --git a/question/format/xml/format.php b/question/format/xml/format.php
index cf091ab6439df93838745f659b9b83567f83ebee..de91b20bd5e3b5bb66f119d8130fc59379d64a50 100755 (executable)
--- a/question/format/xml/format.php
+++ b/question/format/xml/format.php
@@ -232,9 +232,11 @@ class qformat_xml extends qformat_default {
             } 
             if ($answertext == 'true') {
                 $qo->answer = ($answer['@']['fraction'] == 100);
+                $qo->correctanswer = $qo->answer;
                 $qo->feedbacktrue = $feedback;
             } else {
                 $qo->answer = ($answer['@']['fraction'] != 100);
+                $qo->correctanswer = $qo->answer;
                 $qo->feedbackfalse = $feedback;
             }
             $first = false;