Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/file-storage/www/file-add.tcl	12 Jun 2015 08:45:46 -0000	1.19
+++ openacs-4/packages/file-storage/www/file-add.tcl	27 Jun 2015 21:41:49 -0000	1.20
@@ -173,8 +173,8 @@
 	set upload_tmpfiles [list [template::util::file::get_property tmp_filename $upload_file]]
     }
     set mime_type ""
-    if { [empty_string_p [lindex $upload_files 0]]} {
-        if {[parameter::get -parameter AllowTextEdit -default 0] && [empty_string_p [template::util::richtext::get_property html_value $content_body]] } {
+    if { [lindex $upload_files 0] eq ""} {
+        if {[parameter::get -parameter AllowTextEdit -default 0] && [template::util::richtext::get_property html_value $content_body] eq "" } {
             ad_return_complaint 1 "You have to upload a file or create a new one"
             ad_script_abort
         }
@@ -281,7 +281,7 @@
     if {([info exists return_url] && $return_url ne "")} {
 	ad_returnredirect $return_url
     } else {
-	ad_returnredirect "./?[export_vars -url {folder_id}]"
+	ad_returnredirect [export_vars -base ./ {folder_id}]
     }
     ad_script_abort