Merge branch 'MDL-44018_26' of git://github.com/timhunt/moodle into M…

…OODLE_26_STABLE
moodle · Feb 17, 2014 · 759e616 · 759e616
2 parents bfb99b7 + aa083d6
commit 759e616
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php
@@ -216,7 +216,7 @@ protected function add_question_usages($element, $usageidname, $nameprefix = '')
 
         $qas = new backup_nested_element($nameprefix . 'question_attempts');
         $qa = new backup_nested_element($nameprefix . 'question_attempt', array('id'), array(
-                'slot', 'behaviour', 'questionid', 'maxmark', 'minfraction', 'maxfraction',
+                'slot', 'behaviour', 'questionid', 'variant', 'maxmark', 'minfraction', 'maxfraction',
                 'flagged', 'questionsummary', 'rightanswer', 'responsesummary',
                 'timemodified'));
 

diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
@@ -4069,6 +4069,9 @@ protected function restore_question_attempt_worker($data, $nameprefix) {
 
         $data->questionusageid = $this->get_new_parentid($nameprefix . 'question_usage');
         $data->questionid      = $question->newitemid;
+        if (!property_exists($data, 'variant')) {
+            $data->variant = 1;
+        }
         $data->timemodified    = $this->apply_date_offset($data->timemodified);
 
         if (!property_exists($data, 'maxfraction')) {