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 -N -r1.17 -r1.18
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	27 Feb 2004 19:38:35 -0000	1.17
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	27 Feb 2004 22:36:43 -0000	1.18
@@ -91,7 +91,7 @@
   }
   append command "\]"
 
-  template::adp_append_code "if { \[catch { append __adp_output \[$command\] } errmsg\] } {"
+  template::adp_append_code "if { \[catch { ad_try { append __adp_output \[$command\] } ad_script_abort val { } } errmsg\] } {"
   template::adp_append_code "    global errorInfo"
   template::adp_append_code "    append __adp_output \"Error in include template \\\"\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]\\\": \$errmsg\""
   template::adp_append_code "    ns_log Error \"Error in include template \\\"\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]\\\": \$errmsg\n\$errorInfo\""
@@ -586,7 +586,7 @@
   # chunk inside the include-optional tag.
   # Finally, we pop the output off of the __adp_include_optional_output stack.
 
-  template::adp_append_code "if { \[catch { lappend __adp_include_optional_output \[$command\] } errmsg\] } {"
+  template::adp_append_code "if { \[catch { ad_try { lappend __adp_include_optional_output \[$command\] } ad_script_abort val { } } errmsg\] } {"
   template::adp_append_code "    global errorInfo"
   template::adp_append_code "    append __adp_output \"Error in include template \\\"\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]\\\": \$errmsg\""
   template::adp_append_code "    ns_log Error \"Error in include template \\\"\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]\\\": \$errmsg\n\$errorInfo\""