Index: openacs-4/packages/acs-developer-support/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/admin/index.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-developer-support/www/admin/index.tcl	7 Aug 2017 23:47:56 -0000	1.2
+++ openacs-4/packages/acs-developer-support/www/admin/index.tcl	19 Jan 2018 14:39:54 -0000	1.3
@@ -1,4 +1,6 @@
+
 ad_returnredirect ..
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/faq/www/admin/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/configure.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/faq/www/admin/configure.tcl	7 Aug 2017 23:48:10 -0000	1.5
+++ openacs-4/packages/faq/www/admin/configure.tcl	19 Jan 2018 14:44:17 -0000	1.6
@@ -28,10 +28,13 @@
     {return_url:text(hidden) {value $return_url}}
     {submit:text(submit) {label "[_ faq.Change_settings]"}}
 } -on_submit {
+
     parameter::set_value  -parameter "EnableCategoriesP" -value $cat_enabled_p
     parameter::set_value  -parameter "UseWysiwygP" -value $wysiwyg_enabled_p
+
     if {$return_url ne ""} {
         ad_returnredirect $return_url
+        ad_script_abort
     }
 }
 
Index: openacs-4/packages/faq/www/admin/faq-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/faq-delete.tcl	7 Aug 2017 23:48:10 -0000	1.4
+++ openacs-4/packages/faq/www/admin/faq-delete.tcl	19 Jan 2018 14:44:17 -0000	1.5
@@ -28,6 +28,8 @@
 }
 
 ad_returnredirect "index"
+ad_script_abort
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/faq/www/admin/faq-disable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-disable.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/faq-disable.tcl	7 Aug 2017 23:48:10 -0000	1.6
+++ openacs-4/packages/faq/www/admin/faq-disable.tcl	19 Jan 2018 14:44:17 -0000	1.7
@@ -19,6 +19,7 @@
 }
 
 ad_returnredirect $referer
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/faq/www/admin/faq-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/faq/www/admin/faq-edit-2.tcl	7 Aug 2017 23:48:10 -0000	1.3
+++ openacs-4/packages/faq/www/admin/faq-edit-2.tcl	19 Jan 2018 14:44:17 -0000	1.4
@@ -20,8 +20,8 @@
                   where faq_id = :faq_id"
 
 ad_returnredirect "."
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/faq/www/admin/faq-enable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-enable.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/faq/www/admin/faq-enable.tcl	7 Aug 2017 23:48:10 -0000	1.5
+++ openacs-4/packages/faq/www/admin/faq-enable.tcl	19 Jan 2018 14:44:17 -0000	1.6
@@ -21,6 +21,7 @@
 }
 
 ad_returnredirect $referer
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/faq/www/admin/faq-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new-2.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/faq-new-2.tcl	7 Aug 2017 23:48:10 -0000	1.6
+++ openacs-4/packages/faq/www/admin/faq-new-2.tcl	19 Jan 2018 14:44:17 -0000	1.7
@@ -39,6 +39,7 @@
 # on error ...
 
 ad_returnredirect "."
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/faq/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.adp,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/faq/www/admin/index.adp	3 Jul 2015 10:47:35 -0000	1.15
+++ openacs-4/packages/faq/www/admin/index.adp	19 Jan 2018 14:44:17 -0000	1.16
@@ -7,7 +7,7 @@
 <ul class="action-links">
     <li><a href="faq-add-edit" title="#faq.Create_a_new_FAQ#">#faq.Create_a_new_FAQ#</a></li>
     <li><a href="configure?<%=[export_vars -url {return_url}]%>" title="#faq.Configure_FAQ_Preferences#">#faq.Configure#</a></li>
-    <if @use_categories_p@ and @category_container@ eq "package_id">
+    <if @use_categories_p;literal@ true and @category_container@ eq "package_id">
         <li><a href="@category_map_url@" class="action_link" title="#faq.Site_wide_categories#">#faq.Site_wide_categories#</a></li>
     </if>
 </ul>
Index: openacs-4/packages/faq/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/faq/www/admin/index.tcl	7 Aug 2017 23:48:10 -0000	1.12
+++ openacs-4/packages/faq/www/admin/index.tcl	19 Jan 2018 14:44:17 -0000	1.13
@@ -50,7 +50,7 @@
         disabled_p {
             label "Enabled"
             display_template {
-                <if @faqs.disabled_p@ false>
+                <if @faqs.disabled_p;literal@ false>
                   <a href="@faqs.disable_url@" title="#faq.Disable_FAQ# @faqs.faq_name@">
 		  <img src="/resources/acs-subsite/checkboxchecked.gif" height="13" width="13" border="0" style="background-color: white;" alt="#faq.Disable#"></a>
                 </if>
Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp	3 Jul 2015 10:47:35 -0000	1.6
+++ openacs-4/packages/faq/www/admin/q-and-a-add-edit.adp	19 Jan 2018 14:44:17 -0000	1.7
@@ -4,6 +4,6 @@
 <property name="focus">new_quest_answ.question</property>
 
 <formtemplate id="new_quest_answ"></formtemplate>
-<if @use_categories_p@ and @category_container@ eq "package_id">
+<if @use_categories_p;literal@ true and @category_container@ eq "package_id">
     <a href="@category_map_url@" class="action_link">#categories.Site_wide_categories#</a>
 </if>
Index: openacs-4/packages/faq/www/admin/q_and_a-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-delete.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/faq/www/admin/q_and_a-delete.tcl	7 Aug 2017 23:48:10 -0000	1.5
+++ openacs-4/packages/faq/www/admin/q_and_a-delete.tcl	19 Jan 2018 14:44:17 -0000	1.6
@@ -28,6 +28,7 @@
 }
 
 ad_returnredirect "one-faq?faq_id=$faq_id"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl	7 Aug 2017 23:48:10 -0000	1.4
+++ openacs-4/packages/faq/www/admin/q_and_a-edit-2.tcl	19 Jan 2018 14:44:17 -0000	1.5
@@ -26,8 +26,8 @@
                          where entry_id = :entry_id"]
 
 ad_returnredirect "one-faq?faq_id=$faq_id"
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl	7 Aug 2017 23:48:10 -0000	1.9
+++ openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl	19 Jan 2018 14:44:17 -0000	1.10
@@ -75,6 +75,7 @@
 }
 
 ad_returnredirect [export_vars -base one-faq {faq_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/faq/www/admin/swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/swap.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/swap.tcl	7 Aug 2017 23:48:10 -0000	1.6
+++ openacs-4/packages/faq/www/admin/swap.tcl	19 Jan 2018 14:44:17 -0000	1.7
@@ -52,8 +52,8 @@
 db_release_unused_handles
 
 ad_returnredirect [export_vars -base one-faq {faq_id}] 
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/faq/www/categories/remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/remove.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/faq/www/categories/remove.tcl	7 Aug 2017 23:48:11 -0000	1.3
+++ openacs-4/packages/faq/www/categories/remove.tcl	19 Jan 2018 14:44:17 -0000	1.4
@@ -7,6 +7,7 @@
 db_dml nuke {delete from category_object_map where category_id = :cat and object_id = :object_id}
 
 ad_returnredirect -message "removed category" [get_referrer]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl