Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	12 Apr 2013 16:12:56 -0000	1.33
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	27 Oct 2014 16:39:11 -0000	1.34
@@ -24,10 +24,10 @@
 
     If it is not found in any of these places, it defaults to
 
-    [acs_root_dir]/templates
+    $::acs::rootdir/templates
 
     If the value resulting from the search does not start with a '/'
-    it is taken to be relative to [acs_root_dir]
+    it is taken to be relative to $::acs::rootdir
 
     @return the template root (full path from /)
 } {
@@ -46,7 +46,7 @@
 
     if { [string index $template_root 0] ne "/" } {
         # Relative path, prepend server_root
-        set template_root "[acs_root_dir]/$template_root"
+        set template_root "$::acs::rootdir/$template_root"
     }
 
     return [ns_normalizepath $template_root]
@@ -282,7 +282,7 @@
 
 content::get_content $content_type
 
-if { !\[string equal \"text/html\" \$content(mime_type)\] && !\[ad_html_text_convertable_p -from \$content(mime_type) -to text/html\] } {
+if { \"text/html\" ne \$content(mime_type) && !\[ad_html_text_convertable_p -from \$content(mime_type) -to text/html\] } {
     \# don't render its content
     cr_write_content -revision_id \$content(revision_id)
     ad_script_abort