Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -r1.55.2.1 -r1.55.2.2
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	12 Sep 2015 16:47:24 -0000	1.55.2.1
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	18 Sep 2015 07:31:48 -0000	1.55.2.2
@@ -534,7 +534,7 @@
 
     # We do each substitution set in two pieces, separately for normal
     # variables and for variables with ";noquote" attached to them.
-    # Specifically, @x@ gets translated to [ad_quotehtml ${x}], whereas
+    # Specifically, @x@ gets translated to [ns_quotehtml ${x}], whereas
     # @x;noquote@ gets translated to ${x}.  The same goes for array
     # variable references.
 
@@ -553,7 +553,7 @@
     if {[ns_quotehtml ""] eq ""} {
         while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize $\2(\3)]]} code]} {}
     } else {
-        while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ad_quotehtml [lang::util::localize $\2(\3)]]} code]} {}
+        while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize $\2(\3)]]} code]} {}
     }
 
     # substitute simple variable references
@@ -563,7 +563,7 @@
     if {[ns_quotehtml ""] eq ""} {
         while {[regsub -all [template::adp_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize ${\2}]]} code]} {}
     } else {
-        while {[regsub -all [template::adp_variable_regexp] $code {\1[ad_quotehtml [lang::util::localize ${\2}]]} code]} {}
+        while {[regsub -all [template::adp_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize ${\2}]]} code]} {}
     }
 
     # unescape protected # references