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.61 -r1.180.2.62
--- openacs-4/packages/xowiki/xowiki.info	29 Mar 2021 08:34:18 -0000	1.180.2.61
+++ openacs-4/packages/xowiki/xowiki.info	5 Apr 2021 12:23:25 -0000	1.180.2.62
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d77" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d77.apm">
+    <version name="5.10.0d78" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d78.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>2017-08-06</release-date>
@@ -55,7 +55,7 @@
 	<license>BSD-Style</license>
 	<maturity>2</maturity>
 
-	<provides url="xowiki" version="5.10.0d77"/>
+	<provides url="xowiki" version="5.10.0d78"/>
 	<requires url="xotcl-core" version="5.10.0d38"/>
 	<requires url="acs-datetime" version="5.9.1"/>
 	<requires url="acs-kernel" version="5.9.1"/>
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.155 -r1.284.2.156
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	29 Mar 2021 08:31:37 -0000	1.284.2.155
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	5 Apr 2021 12:23:25 -0000	1.284.2.156
@@ -26,6 +26,7 @@
     {style}
     {type text}
     {label}
+    {label_noquote}
     {name}
     {id}
     {title}
@@ -156,7 +157,7 @@
     #
     if {$value ne ""} {
       if {[info exists :$attrName]} {
-        lappend :$attrName $value
+        append :$attrName " " $value
       } else {
         set :$attrName $value
       }
@@ -1697,7 +1698,11 @@
     # don't disable submit buttons
     if {[:type] eq "submit"} {:unset -nocomplain disabled}
     ::html::button [:get_attributes name type {form_button_CSSclass class} title disabled] {
-      ::html::t ${:value}
+      if {[info exists :label_noquote] && ${:label_noquote}} {
+        ::html::t -disableOutputEscaping ${:value}
+      } else {
+        ::html::t ${:value}
+      }
     }
     #::html::input [:get_attributes name type {form_button_CSSclass class} value title disabled] {}
     :render_localizer
@@ -4500,7 +4505,7 @@
       # representation might be lost.
 
       switch $render_hints {
-        "multiple_lines" {
+        multiple_lines {
           set type textarea
           dict set field_fc_dict rows [dict get $render_hints_dict lines]
           dict set field_fc_dict autosave true