Merge branch 'm21_MDL-32102' of git://github.com/danmarsden/moodle in…

…to MOODLE_21_STABLE
moodle · Apr 24, 2012 · 43b542b · 43b542b
2 parents 42657ab + af6e993
commit 43b542b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/backup/moodle2/restore_final_task.class.php b/backup/moodle2/restore_final_task.class.php
@@ -55,8 +55,11 @@ public function build() {
             $this->add_step(new restore_gradebook_structure_step('gradebook_step','gradebook.xml'));
         }
 
-        // Course completion
+        // Course completion, executed conditionally if restoring to new course
-        $this->add_step(new restore_course_completion_structure_step('course_completion', 'completion.xml'));
+        if ($this->get_target() !== backup::TARGET_CURRENT_ADDING &&
+            $this->get_target() !== backup::TARGET_EXISTING_ADDING) {
+            $this->add_step(new restore_course_completion_structure_step('course_completion', 'completion.xml'));
+        }
 
         // Review all the module_availability records in backup_ids in order
         // to match them with existing modules / grade items.