Now only restored wikis (posts and resources) are re-encoded when

restoring to a existing course. Bug 1571.
(http://moodle.org/bugs/bug.php?op=show&bugid=1571)

Merged from MOODLE_13_STABLE

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 9d0ff0afc21f38c908074bb469f0411551840cfc..5c5915140174f94377199d0c10dd59f62ecf6555 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -131,13 +131,17 @@
         //Check we are restoring forums
         if ($restore->mods['forum']->restore == 1) {
             echo "<li>".get_string("from")." ".get_string("modulenameplural","forum");
-            //Get all course posts
+            //Get all course posts being restored
             if ($posts = get_records_sql ("SELECT p.id, p.message
                                        FROM {$CFG->prefix}forum_posts p,
-                                            {$CFG->prefix}forum_discussions d
+                                            {$CFG->prefix}forum_discussions d,
+                                            {$CFG->prefix}backup_ids b
                                        WHERE d.course = $restore->course_id AND
                                              p.discussion = d.id AND
-                                             p.format = $formatwiki")) {
+                                             p.format = $formatwiki AND
+                                             b.backup_code = $restore->backup_unique_code AND
+                                             b.table_name = 'forum_posts' AND
+                                             b.new_id = p.id")) {
                 //Iterate over each post->message
                 $i = 0;   //Counter to send some output to the browser to avoid timeouts
                 foreach ($posts as $post) {
@@ -172,11 +176,15 @@
         //Check we are restoring resources
         if ($restore->mods['resource']->restore == 1) {
             echo "<li>".get_string("from")." ".get_string("modulenameplural","resource");
-            //Get all course resources of type=8 WIKITEXT
+            //Get all course resources of type=8 WIKITEXT being restored
             if ($resources = get_records_sql ("SELECT r.id, r.alltext
-                                       FROM {$CFG->prefix}resource r
+                                       FROM {$CFG->prefix}resource r,
+                                            {$CFG->prefix}backup_ids b
                                        WHERE r.course = $restore->course_id AND
-                                             r.type = $typewiki")) {
+                                             r.type = $typewiki AND
+                                             b.backup_code = $restore->backup_unique_code AND
+                                             b.table_name = 'resource' AND
+                                             b.new_id = r.id")) {
                 //Iterate over each resource->alltext
                 $i = 0;   //Counter to send some output to the browser to avoid timeouts
                 foreach ($resources as $resource) {

diff --git a/backup/version.php b/backup/version.php
index 18d6153a9494ccafa33e9cdaa1172dd8b203c3c5..aa10c813e38beec251f549d2b8246129eeca9ea6 100644 (file)
--- a/backup/version.php
+++ b/backup/version.php
@@ -5,6 +5,6 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$backup_version = 2004062600;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2004070800;   // The current version is a date (YYYYMMDDXX)
 
 $backup_release = "1.4 development";  // User-friendly version number