Index: openacs-4/packages/acs-templating/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/filter-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-templating/tcl/filter-procs.tcl	10 Jan 2007 21:22:12 -0000	1.15
+++ openacs-4/packages/acs-templating/tcl/filter-procs.tcl	27 Oct 2014 16:40:11 -0000	1.16
@@ -27,7 +27,7 @@
 
     set cache_p [lindex $args 0]
 
-    if {$cache_p eq "t"} {
+    if {$cache_p == "t"} {
         set persistent_p [lindex $args 1]
 	set excluded_vars [lindex $args 2]
 
@@ -76,7 +76,7 @@
         set url [ns_conn url]
         regsub {.cmp} $url {} url_stub
         regexp {^/([^/]*)(.*)} $url_stub all package_key rest
-        set file_stub "[acs_root_dir]/packages/$package_key/www$rest"
+        set file_stub "$::acs::rootdir/packages/$package_key/www$rest"
 
         set beginTime [clock clicks -milliseconds]
 
@@ -102,7 +102,7 @@
         set url [ns_conn url]
         regsub {.dat} $url {} url_stub
         regexp {^/([^/]*)(.*)} $url_stub all package_key rest
-        set code_stub "[acs_root_dir]/packages/$package_key/www$rest"
+        set code_stub "$::acs::rootdir/packages/$package_key/www$rest"
 
         set beginTime [clock clicks -milliseconds]
 
@@ -136,11 +136,10 @@
         set url [ns_conn url]
         regsub {.frm} $url {} url_stub
         regexp {^/([^/]*)(.*)} $url_stub all package_key rest
-        set __adp_stub "[acs_root_dir]/packages/$package_key/www$rest"
+        set __adp_stub "$::acs::rootdir/packages/$package_key/www$rest"
 
         # Set the parse level
-        variable parse_level
-        lappend parse_level [info level]
+        lappend ::templating::parse_level [info level]
 
         # execute the code to prepare the form(s) for a template
         adp_prepare