Index: openacs-4/packages/forums/www/mark-all-read.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/mark-all-read.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/mark-all-read.tcl	7 Aug 2017 23:48:11 -0000	1.4
+++ openacs-4/packages/forums/www/mark-all-read.tcl	19 Jan 2018 14:20:33 -0000	1.5
@@ -14,6 +14,7 @@
 
 
 ad_returnredirect forum-view?forum_id=$forum_id
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/forums/www/admin/forum-disable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-disable.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/www/admin/forum-disable.tcl	7 Aug 2017 23:48:11 -0000	1.8
+++ openacs-4/packages/forums/www/admin/forum-disable.tcl	19 Jan 2018 14:20:33 -0000	1.9
@@ -13,10 +13,8 @@
 forum::disable -forum_id $forum_id
 
 ad_returnredirect "."
+ad_script_abort
 
-
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/forums/www/admin/forum-enable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-enable.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/www/admin/forum-enable.tcl	7 Aug 2017 23:48:11 -0000	1.8
+++ openacs-4/packages/forums/www/admin/forum-enable.tcl	19 Jan 2018 14:20:33 -0000	1.9
@@ -13,10 +13,8 @@
 forum::enable -forum_id $forum_id
 
 ad_returnredirect "."
+ad_script_abort
 
-
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/forums/www/moderate/message-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-approve.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/www/moderate/message-approve.tcl	27 Sep 2017 11:07:52 -0000	1.7
+++ openacs-4/packages/forums/www/moderate/message-approve.tcl	19 Jan 2018 14:20:33 -0000	1.8
@@ -19,10 +19,8 @@
 forum::message::approve -message_id $message_id
 
 ad_returnredirect "$return_url?message_id=$message_id"
+ad_script_abort
 
-
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/forums/www/moderate/message-reject.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-reject.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/www/moderate/message-reject.tcl	27 Sep 2017 11:07:52 -0000	1.7
+++ openacs-4/packages/forums/www/moderate/message-reject.tcl	19 Jan 2018 14:20:33 -0000	1.8
@@ -19,10 +19,8 @@
 forum::message::reject -message_id $message_id
 
 ad_returnredirect "$return_url?message_id=$message_id"
+ad_script_abort
 
-
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/calendar/www/cal-item-create-recurrence.adp	7 Aug 2017 23:48:05 -0000	1.15
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence.adp	19 Jan 2018 14:27:14 -0000	1.16
@@ -15,7 +15,7 @@
 <p>
 <strong>#calendar.Date#</strong> @cal_item.start_date@<br>
 <strong>#calendar.Time#</strong>
-<if @cal_item.time_p@>
+<if @cal_item.time_p;literal@ true>
   @cal_item.start_time@ - @cal_item.end_time@
 </if>
 <else>
Index: openacs-4/packages/calendar/www/cal-item-delete-all-occurrences.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-all-occurrences.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/calendar/www/cal-item-delete-all-occurrences.tcl	7 Aug 2017 23:48:05 -0000	1.6
+++ openacs-4/packages/calendar/www/cal-item-delete-all-occurrences.tcl	19 Jan 2018 14:27:15 -0000	1.7
@@ -12,6 +12,7 @@
 calendar::item::delete_recurrence -recurrence_id $recurrence_id
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/calendar/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/index.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/calendar/www/index.tcl	7 Aug 2017 23:48:05 -0000	1.19
+++ openacs-4/packages/calendar/www/index.tcl	19 Jan 2018 14:27:15 -0000	1.20
@@ -21,6 +21,7 @@
 } 
 
 ad_returnredirect "view"    
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/calendar/www/item-type-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/item-type-delete.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/item-type-delete.tcl	7 Aug 2017 23:48:05 -0000	1.4
+++ openacs-4/packages/calendar/www/item-type-delete.tcl	19 Jan 2018 14:27:15 -0000	1.5
@@ -19,9 +19,8 @@
 calendar::item_type_delete -calendar_id $calendar_id -item_type_id $item_type_id
 
 ad_returnredirect "calendar-item-types?calendar_id=$calendar_id"
+ad_script_abort
 
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/calendar/www/item-type-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/item-type-new.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/item-type-new.tcl	7 Aug 2017 23:48:05 -0000	1.4
+++ openacs-4/packages/calendar/www/item-type-new.tcl	19 Jan 2018 14:27:15 -0000	1.5
@@ -19,9 +19,8 @@
 calendar::item_type_new -calendar_id $calendar_id -type $type
 
 ad_returnredirect "calendar-item-types?calendar_id=$calendar_id"
+ad_script_abort
 
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/calendar/www/admin/calendar-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-create.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/admin/calendar-create.tcl	7 Aug 2017 23:48:05 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/calendar-create.tcl	19 Jan 2018 14:27:15 -0000	1.4
@@ -44,13 +44,8 @@
     # This would be a special case where they'd have to select their audience first
     ad_returnredirect  "one?action=permission&calendar_id=$calendar_id&calendar_permission=private"
 }
+ad_script_abort
 
-
-
-
-
-
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/calendar/www/admin/calendar-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-delete.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/admin/calendar-delete.tcl	7 Aug 2017 23:48:05 -0000	1.4
+++ openacs-4/packages/calendar/www/admin/calendar-delete.tcl	19 Jan 2018 14:27:15 -0000	1.5
@@ -9,8 +9,8 @@
 calendar::delete -calendar_id $calendar_id
 
 ad_returnredirect .
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4