Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	6 Aug 2006 19:57:09 -0000	1.5
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	7 Aug 2006 20:58:41 -0000	1.6
@@ -103,9 +103,11 @@
 
       my log "--after context delete_link=$delete_link "
       set template [$folder_id get_payload template]
+      set page [self]
 
       if {$template ne ""} {
 	set __including_page $page
+	set __adp_stub [acs_root_dir]/packages/xowiki/www/view-default
 	set template_code [template::adp_compile -string $template]
 	if {[catch {set content [template::adp_eval template_code]} errmsg]} {
 	  set content "Error in Page $name: $errmsg<br>$content"
@@ -119,7 +121,6 @@
 	if {![regexp {^[./]} $template_file]} {
 	  set template_file /packages/xowiki/www/$template_file
 	}
-	set page [self]
 	$package_id return_page -adp $template_file -variables {
 	  references name title item_id page context header_stuff return_url
 	  content references lang_links package_id
Index: openacs-4/packages/xowiki/www/admin/export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/export.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/admin/export.tcl	19 Jan 2006 23:01:58 -0000	1.1
+++ openacs-4/packages/xowiki/www/admin/export.tcl	7 Aug 2006 20:58:41 -0000	1.2
@@ -5,6 +5,7 @@
 db_foreach instance_select \
     [$object_type instance_select_query -folder_id $folder_id -with_subtypes true] {
       ::Generic::CrItem instantiate -item_id $item_id
+      $item_id volatile
       append content [::Serializer deepSerialize $item_id] \n
     }
 
Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/admin/import.tcl	3 May 2006 12:03:23 -0000	1.4
+++ openacs-4/packages/xowiki/www/admin/import.tcl	7 Aug 2006 20:58:41 -0000	1.5
@@ -19,6 +19,8 @@
 
       set upload_tmpfile [template::util::file::get_property tmp_filename $upload_file]
       set f [open $upload_tmpfile]; set content [read $f]; close $f
+
+      foreach o [::xowiki::Page allinstances] { $o destroy }
       if {[catch {eval $content} error]} {
 	set msg "Error: $error"
       } else {