MDL-23478 backup - adding support for fileareas to blocks

ds125v · Jul 23, 2010 · 4a15bb7 · 4a15bb7
1 parent 38588c1
commit 4a15bb7
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 1 deletion.
diff --git a/backup/moodle2/backup_block_task.class.php b/backup/moodle2/backup_block_task.class.php
@@ -195,6 +195,11 @@ abstract protected function define_my_settings();
      */
     abstract protected function define_my_steps();
 
+    /**
+     * Define one array() of fileareas that each block controls
+     */
+    abstract public function get_fileareas();
+
     /**
      * Define one array() of configdata attributes
      * that need to be processed by the contenttransformer

diff --git a/backup/moodle2/backup_default_block_task.class.php b/backup/moodle2/backup_default_block_task.class.php
@@ -38,6 +38,10 @@ protected function define_my_settings() {
     protected function define_my_steps() {
     }
 
+    public function get_fileareas() {
+        return array();
+    }
+
     public function get_configdata_encoded_attributes() {
         return array();
     }

diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php
@@ -1049,6 +1049,11 @@ protected function define_structure() {
 
         $positions->set_source_table('block_positions', array('blockinstanceid' => backup::VAR_PARENTID));
 
+        // File anotations (for fileareas specified on each block)
+        foreach ($this->task->get_fileareas() as $filearea) {
+            $block->annotate_files('block_' . $this->task->get_blockname(), $filearea, null);
+        }
+
         // Return the root element (block)
         return $block;
     }

diff --git a/backup/util/dbops/restore_dbops.class.php b/backup/util/dbops/restore_dbops.class.php
@@ -43,7 +43,7 @@ public static function get_needed_inforef_files($restoreid) {
             $included = false;
             // blocks, based in blocks setting and parent activity/course
             if ($task instanceof restore_block_task) {
-                if (!$task->get_setting('blocks')) { // Blocks not included, continue
+                if (!$task->get_setting_value('blocks')) { // Blocks not included, continue
                     continue;
                 }
                 $parent = basename(dirname(dirname($task->get_taskbasepath())));

diff --git a/blocks/html/backup/moodle2/backup_html_block_task.class.php b/blocks/html/backup/moodle2/backup_html_block_task.class.php
@@ -36,6 +36,10 @@ protected function define_my_settings() {
     protected function define_my_steps() {
     }
 
+    public function get_fileareas() {
+        return array('content');
+    }
+
     public function get_configdata_encoded_attributes() {
         return array('text'); // We need to encode some attrs in configdata
     }

diff --git a/blocks/rss_client/backup/moodle2/backup_rss_client_block_task.class.php b/blocks/rss_client/backup/moodle2/backup_rss_client_block_task.class.php
@@ -42,6 +42,10 @@ protected function define_my_steps() {
         $this->add_step(new backup_rss_client_block_structure_step('rss_client_structure', 'rss_client.xml'));
     }
 
+    public function get_fileareas() {
+        return array(); // No associated fileareas
+    }
+
     public function get_configdata_encoded_attributes() {
         return array(); // No special handling of configdata
     }