From: Marina Glancy <marina@moodle.com>
Date: Fri, 28 Mar 2014 02:26:01 +0000 (+0800)
Subject: MDL-35305 wiki: backup and restore files
X-Git-Tag: v2.7.0-beta~138^2
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=e9e9b197b36269e26dd8018723a9c66e73acacfd;hp=ad32dda90c21dbca464df2ee2a10c7e3a8a3fd9a

MDL-35305 wiki: backup and restore files

Thanks to Tatsuya Shirai for the patch
---

diff --git a/mod/wiki/backup/moodle2/backup_wiki_stepslib.php b/mod/wiki/backup/moodle2/backup_wiki_stepslib.php
index f0288b2cddf..91192905142 100644
--- a/mod/wiki/backup/moodle2/backup_wiki_stepslib.php
+++ b/mod/wiki/backup/moodle2/backup_wiki_stepslib.php
@@ -120,7 +120,7 @@ class backup_wiki_activity_structure_step extends backup_activity_structure_step
 
         // Define file annotations
         $wiki->annotate_files('mod_wiki', 'intro', null); // This file area hasn't itemid
-        $page->annotate_files('mod_wiki', 'attachments', 'id'); // This file area hasn't itemid
+        $subwiki->annotate_files('mod_wiki', 'attachments', 'id'); // This file area hasn't itemid
 
         // Return the root element (wiki), wrapped into standard activity structure
         return $this->prepare_activity_structure($wiki);
diff --git a/mod/wiki/backup/moodle2/restore_wiki_stepslib.php b/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
index d57f32cfe19..bae98ddfcdb 100644
--- a/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
+++ b/mod/wiki/backup/moodle2/restore_wiki_stepslib.php
@@ -91,7 +91,7 @@ class restore_wiki_activity_structure_step extends restore_activity_structure_st
             $newitemid = false;
         }
 
-        $this->set_mapping('wiki_subwiki', $oldid, $newitemid);
+        $this->set_mapping('wiki_subwiki', $oldid, $newitemid, true);
     }
 
     protected function process_wiki_page($data) {
@@ -174,6 +174,6 @@ class restore_wiki_activity_structure_step extends restore_activity_structure_st
     protected function after_execute() {
         // Add wiki related files, no need to match by itemname (just internally handled context)
         $this->add_related_files('mod_wiki', 'intro', null);
-        $this->add_related_files('mod_wiki', 'attachments', 'wiki_page');
+        $this->add_related_files('mod_wiki', 'attachments', 'wiki_subwiki');
     }
 }