Merge branch 'MDL-26587' of git://github.com/nebgor/moodle

jblotus · Jul 16, 2012 · 7e867bb · 7e867bb
2 parents 0e7dd4f + 4b92f65
commit 7e867bb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/question/type/shortanswer/backup/moodle2/restore_qtype_shortanswer_plugin.class.php b/question/type/shortanswer/backup/moodle2/restore_qtype_shortanswer_plugin.class.php
@@ -68,8 +68,8 @@ public function process_shortanswer($data) {
         $questioncreated = $this->get_mappingid('question_created', $oldquestionid) ? true : false;
 
         // If the question has been created by restore, we need to create its
-        // question_shortanswer too
-        if ($questioncreated) {
+        // question_shortanswer too, if they are defined (the gui should ensure this).
+        if ($questioncreated && !empty($data->answers)) {
             // Adjust some columns
             $data->question = $newquestionid;
             // Map sequence of question_answer ids