From 1ac5aabb2f8ba07884f6e87aaeb5497964cdae4d Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Thu, 6 Dec 2007 00:45:31 +0000
Subject: [PATCH] MDL-12439, templates not imported in database preset import

---
 mod/data/lib.php    | 11 +++++++++--
 mod/data/preset.php |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mod/data/lib.php b/mod/data/lib.php
index d00b437b144..1e68a186d58 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1846,8 +1846,15 @@ class PresetImporter {
                 }
             }
         }
-
-        data_update_instance(addslashes_object($settings));
+        
+        // existing valuas MUST be sent too - it can not work without them!
+        foreach ($this->data as $prop=>$unused) {
+            if (array_key_exists($prop, (array)$settings)) {
+                $this->data->$prop = $settings->$prop;
+            }
+        }
+        
+        data_update_instance(addslashes_object($this->data));
 
         if (strstr($this->folder, '/temp/')) clean_preset($this->folder); /* Removes the temporary files */
         return true;
diff --git a/mod/data/preset.php b/mod/data/preset.php
index 551aea83195..09f86502e33 100644
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -327,7 +327,7 @@ echo '<fieldset class="invisiblefieldset">';
 echo '<input type="hidden" name="d" value="'.$data->id.'" />';
 echo '<input type="hidden" name="action" value="importzip" />';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-echo '<input name="file" size="20" value="" id="fromfile" type="text" /><input name="coursefiles" value="'.$strchooseorupload.'" onclick="return openpopup('."'/files/index.php?id=2&amp;choose=uploadpreset.file', 'coursefiles', 'menubar=0,location=0,scrollbars,resizable,width=750,height=500', 0".');" type="button" />';
+echo '<input name="file" size="20" value="" id="fromfile" type="text" /><input name="coursefiles" value="'.$strchooseorupload.'" onclick="return openpopup('."'/files/index.php?id={$course->id}&amp;choose=uploadpreset.file', 'coursefiles', 'menubar=0,location=0,scrollbars,resizable,width=750,height=500', 0".');" type="button" />';
 echo '<input type="submit" value="'.$strimport.'" />';
 echo '</fieldset></form>';
 echo '</td></tr>';