Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.213 -r1.214
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	14 Mar 2008 20:04:56 -0000	1.213
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	18 Mar 2008 12:43:03 -0000	1.214
@@ -219,6 +219,7 @@
 
   Page instproc marshall {} {
     my instvar name
+    my unset_temporary_instance_variables
     if {[regexp {^..:[0-9]+$} $name] ||
         [regexp {^[0-9]+$} $name]} {
       #
@@ -1577,11 +1578,16 @@
     return [expr {[my publish_status] eq "production" && $old_name eq [my revision_id]}]
   }
 
-  Page instproc save_data {{-use_given_publish_date:boolean false} old_name category_ids} {
-    #my log "-- [self args]"
-    # never cache __ia or __field_in_form
+  Page instproc unset_temporary_instance_variables {} {
+    # never save/cache __ia or __field_in_form
     my array unset __ia
     my array unset __field_in_form
+  }
+
+  Page instproc save_data {{-use_given_publish_date:boolean false} old_name category_ids} {
+    #my log "-- [self args]"
+    my unset_temporary_instance_variables
+
     my instvar package_id name
     db_transaction {
       #