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.44 -r1.45
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	21 Dec 2008 17:28:52 -0000	1.44
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	9 Jan 2010 01:56:09 -0000	1.45
@@ -412,11 +412,11 @@
       # Here we add profiling calls if developer support exists on the 
       # system.
       if {[llength [info procs ::ds_enabled_p]]} { 
-        proc ::template::code::${type}::$file_stub {} "if {\[::ds_enabled_p\] && \[::ds_collection_enabled_p\]} { ds_profile start $file_stub.$type }
+        proc ::template::code::${type}::$file_stub {} "if {\[::ds_enabled_p\] && \[::ds_collection_enabled_p\] && \[::ds_profiling_enabled_p\]} { ds_profile start $file_stub.$type }
 uplevel {
 $code
 }
-if {\[::ds_enabled_p\] && \[::ds_collection_enabled_p\]} { ds_profile stop $file_stub.$type }\n"
+if {\[::ds_enabled_p\] && \[::ds_collection_enabled_p\] &&\[::ds_profiling_enabled_p\]} { ds_profile stop $file_stub.$type }\n"
       } else { 
         proc ::template::code::${type}::$file_stub {} "
     	uplevel {