Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.116 -r1.117
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	18 Apr 2008 20:22:53 -0000	1.116
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	21 Apr 2008 10:26:44 -0000	1.117
@@ -615,7 +615,6 @@
     set todo [list]
 
     foreach o $objects {
-      $o demarshall -parent_id $folder_id -package_id $package_id -creation_user $user_id
 
       # page instances have references to page templates, add these first
       if {[$o istype ::xowiki::PageInstance]} {
@@ -624,6 +623,8 @@
       }
       my log "importing (1st round) $o [$o name] [$o info class]"
 
+      $o demarshall -parent_id $folder_id -package_id $package_id -creation_user $user_id
+
       set item_id [::xo::db::CrClass lookup -name [$o set name] -parent_id $folder_id]
       if {$item_id != 0} {
 	if {$replace} { ;# we delete the original
@@ -648,6 +649,7 @@
       set c 0
       set found 0
       foreach o $todo {
+        $o demarshall -parent_id $folder_id -package_id $package_id -creation_user $user_id
 	set old_template_id [$o set page_template]
 	set template_id [::xo::db::CrClass lookup \
                              -name [::$old_template_id set name] \