Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -N -r1.87.2.2 -r1.87.2.3
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	25 Apr 2019 16:39:10 -0000	1.87.2.2
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	25 Apr 2019 19:21:04 -0000	1.87.2.3
@@ -1141,7 +1141,10 @@
                 if { ![template::element error_p $form_name $element_name]
                      && ![uplevel #$level [list expr $validate_expr]]
                  } {
-                    template::element set_error $form_name $element_name [util::var_subst_quotehtml -ulevel 2 $error_message]
+                    template::element set_error \
+                        $form_name \
+                        $element_name \
+                        [util::var_subst_quotehtml -level 2 $error_message]
                 }
             }
         }
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.189.2.12 -r1.189.2.13
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	25 Apr 2019 16:39:10 -0000	1.189.2.12
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	25 Apr 2019 19:21:04 -0000	1.189.2.13
@@ -4069,7 +4069,7 @@
 }
 
 ad_proc -public util::var_subst_quotehtml {
-   {-ulevel 1}
+   {-level 1}
    string
 } {
 
@@ -4079,8 +4079,9 @@
     supports Tcl array syntax, and Tcl scalar variables with and
     without curly braces.
 
-    @param ulevel Where we should uplevel to when doing the subst's. Defaults to '1', meaning the caller's scope.
-    
+    @param level Where we should uplevel to when doing the subst's.
+           Defaults to '1', meaning the caller's scope.
+
     @author Gustaf Neumann
 } {
     #
@@ -4098,7 +4099,7 @@
     #
     # Finallly, "subst" the result.
     #
-    uplevel $ulevel [list ::subst $result]
+    return [uplevel $level [list ::subst $result]]
 }