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.4 -r1.5
--- openacs-4/packages/file-storage/www/folder-add.tcl	12 Jun 2015 08:45:46 -0000	1.4
+++ openacs-4/packages/file-storage/www/folder-add.tcl	27 Jun 2015 21:41:49 -0000	1.5
@@ -26,7 +26,7 @@
 set user_id [ad_conn user_id]
 
 if {![acs_user::site_wide_admin_p]} {
-    ad_returnredirect "./?[export_vars -url {folder_id}]"
+    ad_returnredirect [export_vars -base ./ {folder_id}]
 }
 
 set package_id [ad_conn package_id]
@@ -58,7 +58,7 @@
 	lappend upload_tmpfiles $file
     }
     
-    if { [empty_string_p [lindex $upload_files 0]]} {
+    if { [lindex $upload_files 0] eq ""} {
 	ad_return_complaint 1 "You have to upload a file"
 	ad_script_abort
     }
@@ -140,7 +140,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