Index: openacs-4/packages/file-storage/www/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/file-storage/www/file-edit.tcl	7 Aug 2017 23:48:11 -0000	1.12
+++ openacs-4/packages/file-storage/www/file-edit.tcl	19 Jan 2018 12:03:41 -0000	1.13
@@ -75,6 +75,7 @@
     }
 } -after_submit {
     ad_returnredirect "file?file_id=$file_id"
+    ad_script_abort
 }
 
 ad_return_template
Index: openacs-4/packages/file-storage/www/folder-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-add.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/file-storage/www/folder-add.tcl	7 Aug 2017 23:48:11 -0000	1.6
+++ openacs-4/packages/file-storage/www/folder-add.tcl	19 Jan 2018 12:03:41 -0000	1.7
@@ -27,6 +27,7 @@
 
 if {![acs_user::site_wide_admin_p]} {
     ad_returnredirect [export_vars -base ./ {folder_id}]
+    ad_script_abort
 }
 
 set package_id [ad_conn package_id]
@@ -44,7 +45,7 @@
     {upload_folder:text(text) {label \#file-storage.Upload_a_folder#} {html "size 30"} {help_text "[_ file-storage.Upload_folder_help]"}}
 }
 
-if {([info exists return_url] && $return_url ne "")} {
+if {[info exists return_url] && $return_url ne ""} {
     ad_form -extend -name file_add -form {
 	{return_url:text(hidden) {value $return_url}}
     }
@@ -137,7 +138,7 @@
  
 } -after_submit {
     
-    if {([info exists return_url] && $return_url ne "")} {
+    if {[info exists return_url] && $return_url ne ""} {
 	ad_returnredirect $return_url
     } else {
 	ad_returnredirect [export_vars -base ./ {folder_id}]
Index: openacs-4/packages/file-storage/www/simple-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/file-storage/www/simple-add.tcl	7 Aug 2017 23:48:11 -0000	1.16
+++ openacs-4/packages/file-storage/www/simple-add.tcl	19 Jan 2018 12:03:41 -0000	1.17
@@ -102,7 +102,7 @@
 } -after_submit {
 
     ad_returnredirect "?folder_id=$folder_id"
-
+    ad_script_abort
 }
 
 # Local variables: