Index: openacs-4/packages/file-storage/lib/folder-links.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/lib/folder-links.tcl	27 Oct 2014 16:41:31 -0000	1.3
+++ openacs-4/packages/file-storage/lib/folder-links.tcl	27 Jun 2015 21:41:49 -0000	1.4
@@ -97,18 +97,18 @@
 	    }
 	    url {
 		set properties_link "properties"
-		set properties_url "${fs_url}simple?[export_vars {object_id return_url}]"
+		set properties_url [export_vars -base ${fs_url}simple {object_id return_url}]
 		set icon "/resources/acs-subsite/url-button.gif"
 		set file_url ${url}
 		set download_url $file_url
 	    }
 	    default {
 
 		set properties_link [_ file-storage.properties]
-		set properties_url "${fs_url}file?[export_vars {{file_id $object_id} return_url}]"
+		set properties_url [export_vars -base ${fs_url}file {{file_id $object_id} return_url}]
 		set icon "/resources/file-storage/file.gif"
 		set file_url "${base_url}${file_url}"
-		set download_url "${fs_url}download/?[export_vars {{file_id $object_id}}]"                
+		set download_url [export_vars -base ${fs_url}download {{file_id $object_id}}]
 	    }
 	}