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.65.2.1 -r1.65.2.2
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	10 Mar 2019 21:59:12 -0000	1.65.2.1
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	1 Nov 2019 13:16:18 -0000	1.65.2.2
@@ -455,7 +455,7 @@
             # Convert syntax to Tcl syntax:
             # It's either an array variable or a Tcl variable
             #   array variables
-            # TODO: ad_quotehtml
+            # TODO: ns_quotehtml
             # TODO: lang::util::localize
             regsub -all {[\]\[\{\}\"]\\$} $substitution {\\&} substitution
             if { [regexp {^%([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)%$} $substitution match arr key] } {
@@ -549,17 +549,9 @@
     while {[regsub -all [template::adp_array_variable_regexp_literal] $code {\1$\2(\3)} code]} {}
     #
     # Some aolservers have broken implementations of ns_quotehtml
-    # (returning for the empty string input a one byte output). If this
-    # happens, we fall back to the "manual" ad_quotehtml. However, we
-    # prefer to use the faster (C-implemented) ns_quotehtml, since the
-    # actual substitutions occur at page-view time, and they are called
-    # therefore very often.
+    # (returning for the empty string input a one byte output). 
     #
-    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[ns_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
     while {[regsub -all [template::adp_variable_regexp_noquote] $code {\1[lang::util::localize ${\2}]} code]} {}