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.55 -r1.56
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	11 May 2007 11:17:59 -0000	1.55
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	18 May 2007 18:22:41 -0000	1.56
@@ -533,8 +533,10 @@
 
     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]} continue
+
       set item_id [CrItem lookup -name [$o set name] -parent_id $folder_id]
       if {$item_id != 0} {
 	if {$replace} { ;# we delete the original
@@ -549,7 +551,7 @@
 	}
       }
       if {$item_id == 0} {
-        $o save_new
+        set n [$o save_new]
         incr added
       }
     }
@@ -573,16 +575,16 @@
 	  if {$item_id == 0} {  ;# the item does not exist -> update reference and save
             set old_template_id [$o set page_template]
             set template [CrItem lookup \
-                              -name [$old_template_id set name] \
+                              -name [::$old_template_id set name] \
                               -parent_id $folder_id]
             $o set page_template $template
             $o save_new
             incr added
           }
         }
       }
-      $o destroy
     }
+    foreach o $objects {$o destroy}
     append msg "$added objects newly inserted, $updated object updated, $replaced objects replaced<p>"
   }