Merge branch 'MDL-49547_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

2015-03-31 14:44:10 +01:00
parent d77da9c15a 3142069285
commit 2003c6ef66
1 changed files with 5 additions and 0 deletions
@@ -3706,6 +3706,11 @@ class restore_create_categories_and_questions extends restore_structure_step {

        $data = (object)$data;
        $newquestion = $this->get_new_parentid('question');
+        $questioncreated = (bool) $this->get_mappingid('question_created', $this->get_old_parentid('question'));
+        if (!$questioncreated) {
+            // This question already exists in the question bank. Nothing for us to do.
+            return;
+        }

        if (!empty($CFG->usetags)) { // if enabled in server
            // TODO: This is highly inefficient. Each time we add one tag