Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -r1.67 -r1.68
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	4 Jul 2007 09:22:33 -0000	1.67
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	4 Jul 2007 11:29:04 -0000	1.68
@@ -277,6 +277,16 @@
     return $item_id
   }
 
+  WikiForm instproc after_submit {item_id} {
+    set link [my submit_link]
+    if {$link eq "."} {
+      my instvar data
+      # we can determine submit link only after nls_langauge 
+      # is returned from the user
+      my submit_link [[$data package_id] pretty_link [$data name]]
+    }
+    next
+  }
   #
   # PlainWiki Form
   #
@@ -562,6 +572,12 @@
     set dont_edit [concat [[$data info class] edit_atts] [list title] \
                        [::Generic::CrClass set common_query_atts]]
 
+    
+    set category_spec [$data get_short_spec @categories]
+    foreach f [split $category_spec ,] {
+      if {$f eq "off"} {my set with_categories false}
+    }
+
     #
     # compute list of form instance attributes
     #