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 -r1.36
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	8 Dec 2012 17:50:20 -0000	1.35
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	27 Oct 2014 16:40:12 -0000	1.36
@@ -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\]\]"
@@ -150,9 +150,9 @@
 
 template_tag multiple { chunk params } {
 
-  set name     [template::get_attribute multiple $params name       ]
-  set startrow [template::get_attribute multiple $params startrow  0]
-  set maxrows  [template::get_attribute multiple $params maxrows  -1]; #unlimit
+  set name      [template::get_attribute multiple $params name       ]
+  set startrow  [template::get_attribute multiple $params startrow  0]
+  set maxrows   [template::get_attribute multiple $params maxrows  -1]; #unlimit
   set delimiter [template::get_attribute multiple $params delimiter ""]
 
   set tag_id [template::current_tag]