Index: openacs-4/packages/acs-subsite/www/group-join.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-join.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/group-join.tcl	7 Aug 2017 23:47:58 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/group-join.tcl	19 Jan 2018 14:09:48 -0000	1.4
@@ -35,6 +35,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl	19 Jan 2018 14:09:48 -0000	1.8
@@ -34,7 +34,7 @@
 
     if { $num == 0 } {
         ad_returnredirect .
-        return
+        ad_script_abort
     }
 
     append listing <ul>\n
@@ -90,6 +90,7 @@
 }
      
 ad_returnredirect $return_url
+ad_script_abort
 
 
 #
Index: openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl	19 Jan 2018 14:09:48 -0000	1.8
@@ -63,6 +63,7 @@
 } else {
     ad_returnredirect $return_url
 }
+ad_script_abort
 
 
 # Local variables:
Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -33,6 +33,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -54,6 +54,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/attributes/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/attributes/index.tcl	7 Aug 2017 23:47:58 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/attributes/index.tcl	19 Jan 2018 14:09:48 -0000	1.3
@@ -12,6 +12,7 @@
 }
 
 ad_returnredirect ../
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -22,6 +22,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -49,6 +49,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl	19 Jan 2018 14:09:48 -0000	1.9
@@ -95,6 +95,7 @@
 package_object_view_reset $group_type
 
 ad_returnredirect $return_url 
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl	19 Jan 2018 14:09:48 -0000	1.7
@@ -91,7 +91,7 @@
         group_type::new -group_type $object_type -supertype $supertype $pretty_name $pretty_plural
     }
     ad_returnredirect ""
-    return 
+    ad_script_abort
 }
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl	19 Jan 2018 14:09:48 -0000	1.7
@@ -48,6 +48,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -34,6 +34,7 @@
 
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl	7 Aug 2017 23:47:58 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl	19 Jan 2018 14:09:48 -0000	1.5
@@ -37,6 +37,8 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -25,11 +25,14 @@
 	set return_url [export_vars -base [ad_conn package_url]/admin/groups/one group_id]
     }
     ad_returnredirect [export_vars -base ../rel-segments/new {group_id rel_type return_url}]
+    ad_script_abort
+
 } else {
     if { $return_url eq "" } {
 	set return_url [export_vars -base one group_id]
     }
     ad_returnredirect $return_url
+    ad_script_abort
 }
 
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -33,8 +33,8 @@
     }
 }
 
-
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl	19 Jan 2018 14:09:48 -0000	1.8
@@ -53,8 +53,10 @@
 } else {
     ad_returnredirect [export_vars -base constraints-create {group_id rel_type return_url}]
 }
+ad_script_abort
 
 
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -69,6 +69,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/host-node-map/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/host-node-map/delete.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/host-node-map/delete.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/host-node-map/delete.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -17,6 +17,7 @@
 }
 
 ad_returnredirect index
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/parties/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	7 Aug 2017 23:47:58 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	19 Jan 2018 14:09:48 -0000	1.11
@@ -130,6 +130,7 @@
 foreach {type url} $redirects_for_type {
     if {[lsearch $object_type_path_list $type] != -1} {
 	ad_returnredirect [ad_conn package_url]admin/$url
+        ad_script_abort
     }
 }
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -24,8 +24,8 @@
     }
     ad_returnredirect $return_url
 }
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -42,8 +42,8 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	7 Aug 2017 23:47:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	19 Jan 2018 14:09:48 -0000	1.9
@@ -57,7 +57,7 @@
 if { ![db_string segments_exists_p {}] } {
     # No more segments... can't create constraints
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl	19 Jan 2018 14:09:48 -0000	1.8
@@ -54,6 +54,7 @@
 
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/add-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/add-2.tcl	7 Aug 2017 23:47:58 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/add-2.tcl	19 Jan 2018 14:09:48 -0000	1.4
@@ -23,6 +23,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl	19 Jan 2018 14:09:48 -0000	1.7
@@ -63,6 +63,7 @@
 package_object_view_reset $rel_type
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl	19 Jan 2018 14:09:48 -0000	1.7
@@ -34,6 +34,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl	7 Aug 2017 23:47:58 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl	19 Jan 2018 14:09:48 -0000	1.4
@@ -30,6 +30,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/relations/change-member-state.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/change-member-state.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/relations/change-member-state.tcl	7 Aug 2017 23:47:58 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/relations/change-member-state.tcl	19 Jan 2018 14:09:48 -0000	1.5
@@ -35,7 +35,10 @@
 if {$return_url eq ""} {
     set return_url "one?rel_id=$rel_id"
 }
+
 ad_returnredirect $return_url
+ad_script_abort
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-subsite/www/admin/relations/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/relations/index.tcl	7 Aug 2017 23:47:58 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/relations/index.tcl	19 Jan 2018 14:09:48 -0000	1.3
@@ -12,8 +12,8 @@
 }
 
 ad_returnredirect ../rel-types/
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -35,6 +35,7 @@
 db_release_unused_handles
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -56,6 +56,8 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl	19 Jan 2018 14:09:48 -0000	1.7
@@ -21,6 +21,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl	19 Jan 2018 14:09:48 -0000	1.8
@@ -19,6 +19,7 @@
 site_node::delete -node_id $node_id
 
 ad_returnredirect [export_vars -base . {expand:multiple root_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl	7 Aug 2017 23:47:58 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl	19 Jan 2018 14:09:48 -0000	1.12
@@ -56,6 +56,7 @@
 }
 	
 ad_returnredirect ${parent}admin/site-map
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl	7 Aug 2017 23:47:58 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl	19 Jan 2018 14:09:48 -0000	1.6
@@ -17,6 +17,7 @@
 site_node::mount -node_id $node_id -object_id $package_id
 
 ad_returnredirect [export_vars -base . {expand:multiple root_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl	1 Oct 2017 12:16:05 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl	19 Jan 2018 14:09:48 -0000	1.10
@@ -66,6 +66,7 @@
 }
 
 ad_returnredirect [export_vars -base . {expand:multiple root_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	7 Aug 2017 23:47:58 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	19 Jan 2018 14:09:48 -0000	1.17
@@ -70,6 +70,7 @@
 }
 
 ad_returnredirect [export_vars -base . {expand:multiple root_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl	19 Jan 2018 14:09:48 -0000	1.8
@@ -28,6 +28,7 @@
 } else {
     ad_returnredirect $return_url
 }
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/rename.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/rename.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/rename.tcl	7 Aug 2017 23:47:58 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/rename.tcl	19 Jan 2018 14:09:48 -0000	1.5
@@ -43,6 +43,7 @@
 
 
 ad_returnredirect [export_vars -base "." { expand:multiple root_id }]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl	19 Jan 2018 14:09:48 -0000	1.7
@@ -15,6 +15,7 @@
 site_node::unmount -node_id $node_id
 
 ad_returnredirect [export_vars -base . {expand:multiple root_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl	7 Aug 2017 23:47:59 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl	19 Jan 2018 14:09:48 -0000	1.9
@@ -25,6 +25,7 @@
 }
 
 ad_returnredirect [export_vars -base one {object_id application_url}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl	7 Aug 2017 23:47:59 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/pvt/toggle-dont-spam-me-p.tcl	19 Jan 2018 14:09:48 -0000	1.5
@@ -1,13 +1,12 @@
 # $Id$
 
 set user_id [ad_conn user_id]
-
-
-
 db_dml unused "update user_preferences set dont_spam_me_p = util.logical_negation(dont_spam_me_p) where user_id = :user_id"
 
 ad_returnredirect "home"
+ad_script_abort
 
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl	7 Aug 2017 23:47:59 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl	19 Jan 2018 14:09:48 -0000	1.11
@@ -59,6 +59,7 @@
     db_dml comment_update {}
 
     ad_returnredirect $return_url
+    ad_script_abort
 }
 
 ad_return_template
Index: openacs-4/packages/acs-templating/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/filter-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-templating/tcl/filter-procs.tcl	17 Jan 2018 21:57:34 -0000	1.18
+++ openacs-4/packages/acs-templating/tcl/filter-procs.tcl	19 Jan 2018 14:16:01 -0000	1.19
@@ -33,7 +33,7 @@
 
     if {$cache_p == "t"} {
         set persistent_p [lindex $args 1]
-	set excluded_vars [lindex $args 2]
+        set excluded_vars [lindex $args 2]
 
         ad_cache_returnredirect $url $persistent_p $excluded_vars
     } else {
Index: openacs-4/packages/acs-templating/www/doc/demo/list5/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list5/delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/demo/list5/delete.tcl	7 Aug 2017 23:48:02 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/demo/list5/delete.tcl	19 Jan 2018 14:16:01 -0000	1.4
@@ -34,6 +34,7 @@
 }
 
 ad_returnredirect "./"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-templating/www/doc/demo/list6/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list6/delete.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/www/doc/demo/list6/delete.tcl	7 Aug 2017 23:48:02 -0000	1.4
+++ openacs-4/packages/acs-templating/www/doc/demo/list6/delete.tcl	19 Jan 2018 14:16:01 -0000	1.5
@@ -16,6 +16,7 @@
 }
 
 ad_returnredirect "./"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-templating/www/doc/demo/list7/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list7/delete.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/www/doc/demo/list7/delete.tcl	7 Aug 2017 23:48:02 -0000	1.5
+++ openacs-4/packages/acs-templating/www/doc/demo/list7/delete.tcl	19 Jan 2018 14:16:01 -0000	1.6
@@ -19,6 +19,7 @@
 }
 
 ad_returnredirect "./"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-templating/www/doc/demo/list8/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list8/delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-templating/www/doc/demo/list8/delete.tcl	7 Aug 2017 23:48:03 -0000	1.7
+++ openacs-4/packages/acs-templating/www/doc/demo/list8/delete.tcl	19 Jan 2018 14:16:01 -0000	1.8
@@ -19,6 +19,7 @@
 }
 
 ad_returnredirect "./"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-templating/www/doc/demo/list9/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list9/delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/demo/list9/delete.tcl	7 Aug 2017 23:48:03 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/demo/list9/delete.tcl	19 Jan 2018 14:16:01 -0000	1.4
@@ -26,6 +26,7 @@
 cache flush notes*
 
 ad_returnredirect "./"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl