Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -r1.45 -r1.45.2.1
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	12 Apr 2013 16:12:57 -0000	1.45
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	13 Sep 2013 12:02:23 -0000	1.45.2.1
@@ -873,7 +873,7 @@
 
     append export_data "
       <div><input type=\"hidden\" name=\"$key\" 
-             value=\"[template::util::quote_html $value]\"></div>"
+             value=\"[ad_quotehtml $value]\"></div>"
   }
 
   return $export_data
Index: openacs-4/packages/acs-templating/tcl/util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/util-procs.tcl,v
diff -u -r1.26 -r1.26.2.1
--- openacs-4/packages/acs-templating/tcl/util-procs.tcl	12 Apr 2013 16:12:57 -0000	1.26
+++ openacs-4/packages/acs-templating/tcl/util-procs.tcl	13 Sep 2013 12:02:23 -0000	1.26.2.1
@@ -595,15 +595,13 @@
   ns_set put [ns_conn outputheaders] "Set-Cookie" $cookie
 } 
 
-ad_proc -public template::util::quote_html {
+ad_proc -deprecated -public template::util::quote_html {
   html
 } {
   Quote possible HTML tags in the contents of the html parameter.  
 } {
 
-  regsub -all \" [ns_quotehtml $html] \\&quot\; html
-
-  return $html
+  return [ad_quotehtml $html]
 }
 
 ad_proc -public template::util::multirow_quote_html {multirow_ref column_ref} {
@@ -619,7 +617,7 @@
 
     for { set i 1 } { $i <= $rowcount } { incr i} {
         upvar $multirow_ref:$i arr
-        set arr($column_ref) [template::util::quote_html [set arr($column_ref)]]
+        set arr($column_ref) [ad_quotehtml [set arr($column_ref)]]
     }
 
 }
Index: openacs-4/packages/acs-templating/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/widget-procs.tcl,v
diff -u -r1.50 -r1.50.8.1
--- openacs-4/packages/acs-templating/tcl/widget-procs.tcl	8 Sep 2008 18:50:15 -0000	1.50
+++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl	13 Sep 2013 12:02:23 -0000	1.50.8.1
@@ -401,7 +401,7 @@
 		}
 
         if { [info exists element(value)] } {
-            append output " value=\"[template::util::quote_html $element(value)]\""
+            append output " value=\"[ad_quotehtml $element(value)]\""
         } 
 
         foreach name [array names attributes] {
@@ -655,7 +655,7 @@
                     set label [lindex $option 0]
                     set value [lindex $option 1]
 
-                    append output " <input type=\"$widget_type\" name=\"$widget_name\" value=\"[template::util::quote_html $value]\""
+                    append output " <input type=\"$widget_type\" name=\"$widget_name\" value=\"[ad_quotehtml $value]\""
                     if { [info exists values($value)] } {
                         append output " checked=\"checked\""
                     }
@@ -680,7 +680,7 @@
                     set label [lindex $option 0]
                     set value [lindex $option 1]
 
-                    append output " <option value=\"[template::util::quote_html $value]\""
+                    append output " <option value=\"[ad_quotehtml $value]\""
                     if { [info exists values($value)] } {
                         append output " selected=\"selected\""
                     }