MDL-23109 backup - exclude info in moodle_backup.xml about non-includ…

…ed task. Thanks SamH!
yousuftafhim · Jul 22, 2010 · fbd7413 · fbd7413
1 parent 71aa947
commit fbd7413
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/backup/moodle2/restore_plan_builder.class.php b/backup/moodle2/restore_plan_builder.class.php
@@ -163,11 +163,6 @@ static protected function build_course_plan($controller, $courseid) {
         $task = restore_factory::get_restore_course_task($info->course, $courseid);
         $plan->add_task($task);
 
-        // For the given course, add as many section tasks as necessary
-        foreach ($info->sections as $sectionid => $section) {
-            self::build_section_plan($controller, $sectionid);
-        }
-
         // For the given course path, add as many block tasks as necessary
         // TODO: Add blocks, we need to introspect xml here
         $blocks = backup_general_helper::get_blocks_from_path($task->get_taskbasepath());
@@ -178,5 +173,10 @@ static protected function build_course_plan($controller, $courseid) {
                 // TODO: Debug information about block not supported
             }
         }
+
+        // For the given course, add as many section tasks as necessary
+        foreach ($info->sections as $sectionid => $section) {
+            self::build_section_plan($controller, $sectionid);
+        }
     }
 }
diff --git a/backup/util/dbops/backup_controller_dbops.class.php b/backup/util/dbops/backup_controller_dbops.class.php
@@ -315,15 +315,19 @@ public static function get_moodle_backup_information($backupid) {
 
             if ($task instanceof backup_activity_task) { // Activity task
 
-                list($contentinfo, $settings) = self::get_activity_backup_information($task);
-                $contentsinfo['activities'][] = $contentinfo;
-                $settingsinfo = array_merge($settingsinfo, $settings);
+                if ($task->get_setting_value('included')) { // Only return info about included activities
+                    list($contentinfo, $settings) = self::get_activity_backup_information($task);
+                    $contentsinfo['activities'][] = $contentinfo;
+                    $settingsinfo = array_merge($settingsinfo, $settings);
+                }
 
             } else if ($task instanceof backup_section_task) { // Section task
 
-                list($contentinfo, $settings) = self::get_section_backup_information($task);
-                $contentsinfo['sections'][] = $contentinfo;
-                $settingsinfo = array_merge($settingsinfo, $settings);
+                if ($task->get_setting_value('included')) { // Only return info about included sections
+                    list($contentinfo, $settings) = self::get_section_backup_information($task);
+                    $contentsinfo['sections'][] = $contentinfo;
+                    $settingsinfo = array_merge($settingsinfo, $settings);
+                }
 
             } else if ($task instanceof backup_course_task) { // Course task