Index: openacs-4/packages/acs-templating/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/element-procs.tcl,v
diff -u -N -r1.37.2.1 -r1.37.2.2
--- openacs-4/packages/acs-templating/tcl/element-procs.tcl	25 Apr 2019 09:19:45 -0000	1.37.2.1
+++ openacs-4/packages/acs-templating/tcl/element-procs.tcl	25 Apr 2019 15:49:19 -0000	1.37.2.2
@@ -531,11 +531,12 @@
     foreach { v_name v_code v_message } $element(validate) {
 
       if { ! [eval $v_code] } {
-      
-	# value is invalid according to custom validation code
+
+        # value is invalid according to custom validation code
         # Do some expansion on $value, ${value}, $label, and ${label}
-	lappend v_errors [string map [list \$value $value \${value} $value \$label $label \${label} $label] $v_message]
-	set formerror($element_id:$v_name) [lindex $v_errors end]
+        set v_message [util::var_subst_quotehtml $v_message]
+        lappend v_errors $v_message
+        set formerror($element_id:$v_name) $v_message
       }
     }
   }