Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v
diff -u -r1.52.2.10 -r1.52.2.11
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	17 Oct 2013 09:12:26 -0000	1.52.2.10
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	21 Oct 2013 06:27:03 -0000	1.52.2.11
@@ -679,3 +679,23 @@
         }
     }
 }
+
+ad_proc -public ds_init { } {
+
+    Perform setup for the developer support for a single request.  We
+    save the state in global variables to avoid highly redundant
+    computations (up to 50 times per page on openacs.org)
+
+} {
+    if {[::ds_enabled_p] } {
+	#
+	# Save current setup for developer support in global
+	# variables, which are deleted automatically after every
+	# request.
+	#
+	set ::ds_enabled_p 1
+	if {[::ds_collection_enabled_p] } {set ::ds_collection_enabled_p 1}
+	if {[::ds_profiling_enabled_p] } {set ::ds_profiling_enabled_p 1}
+	if {[::ds_show_p]} {set ::_ds_show_p 1}
+    }
+}
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.35.2.1 -r1.35.2.2
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	16 Oct 2013 19:56:15 -0000	1.35.2.1
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	21 Oct 2013 06:27:03 -0000	1.35.2.2
@@ -128,8 +128,8 @@
   template::adp_append_code "        append __adp_output \"Error in include template \\\"\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]\\\": \$errmsg\""
   # JCD: If we have the ds_page_bits cache maybe save the error for later
   if { [info commands ::ds_enabled_p] ne "" && [info commands ::ds_page_fragment_cache_enabled_p] ne "" } {
-      template::adp_append_code "        if {\[::ds_enabled_p\]"
-      template::adp_append_code "            && \[::ds_collection_enabled_p\] } {"
+      template::adp_append_code "        if {\[info exists ::ds_enabled_p\]"
+      template::adp_append_code "            && \[info exists ::ds_collection_enabled_p\] } {"
       template::adp_append_code "            set __include_errors {}"
       template::adp_append_code "            ns_cache get ds_page_bits \[ad_conn request\]:error __include_errors"
       template::adp_append_code "            ns_cache set ds_page_bits \[ad_conn request\]:error \[lappend __include_errors \[list \"$src\" \$errorInfo\]\]"