Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.180.2.70 -r1.180.2.71
--- openacs-4/packages/xowiki/xowiki.info	16 Sep 2021 09:49:46 -0000	1.180.2.70
+++ openacs-4/packages/xowiki/xowiki.info	17 Sep 2021 19:33:55 -0000	1.180.2.71
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.1d1" url="http://openacs.org/repository/download/apm/xowiki-5.10.1d1.apm">
+    <version name="5.10.1d2" url="http://openacs.org/repository/download/apm/xowiki-5.10.1d2.apm">
 	<owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
 	<summary>A xotcl-based enterprise wiki system with multiple object types</summary>
 	<release-date>2021-09-15</release-date>
@@ -55,7 +55,7 @@
 	<license>BSD-Style</license>
 	<maturity>2</maturity>
 
-	<provides url="xowiki" version="5.10.1d1"/>
+	<provides url="xowiki" version="5.10.1d2"/>
 	<requires url="xotcl-core" version="5.10.1d1"/>
 	<requires url="acs-datetime" version="5.9.1"/>
 	<requires url="acs-kernel" version="5.10.0"/>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.284.2.171 -r1.284.2.172
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	6 Sep 2021 16:46:07 -0000	1.284.2.171
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	17 Sep 2021 19:33:56 -0000	1.284.2.172
@@ -700,7 +700,7 @@
 
   FormField ad_instproc dict_to_fc {
     -name
-    -type:required
+    -type
     dict
   } {
 
@@ -712,10 +712,15 @@
     allowed, etc.
 
     @param name optional form-field name
-    @param type required type of the form-field
+    @param type type of the form-field; if not specified,
+           take it from key "_type" of the dict
     @param dict dict to be converted.
   } {
     set result [expr {[info exists name] ? "$name:" : ""}]
+    if {![info exists type]} {
+      set type [dict get $dict _type]
+      dict unset dict _type
+    }
     set list $type
     foreach {key value} $dict {
       lappend list $key=[::xowiki::formfield::FormField fc_encode $value]