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.19 -r1.20 --- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 23 Sep 2003 14:33:59 -0000 1.19 +++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 10 Oct 2003 16:27:30 -0000 1.20 @@ -425,19 +425,11 @@ # variable references. # substitute array variable references - if { [lsearch -exact {new-portals foobar} [ad_conn package_key]] == -1 } { - while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ad_quotehtml $\2(\3)]} code]} {} - } else { - while {[regsub -all [template::adp_array_variable_regexp] $code {\1${\2(\3)}} code]} {} - } + while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ad_quotehtml $\2(\3)]} code]} {} while {[regsub -all [template::adp_array_variable_regexp_noquote] $code {\1$\2(\3)} code]} {} # substitute simple variable references - if { [lsearch -exact {new-portals} [ad_conn package_key]] == -1 } { - while {[regsub -all [template::adp_variable_regexp] $code {\1[ad_quotehtml ${\2}]} code]} {} - } else { - while {[regsub -all [template::adp_variable_regexp] $code {\1${\2}} code]} {} - } + while {[regsub -all [template::adp_variable_regexp] $code {\1[ad_quotehtml ${\2}]} code]} {} while {[regsub -all [template::adp_variable_regexp_noquote] $code {\1${\2}} code]} {} # unescape protected @ references