Index: resource.class.php
===================================================================
--- resource.class.php	(revision 330)
+++ resource.class.php	(working copy)
@@ -127,10 +127,11 @@
             $icon = mimeinfo("icon", $file);
 
             if ($CFG->slasharguments) {
-                $relativeurl = "/file.php/$relativepath/$file";
+                $relativeurl = "/file.php/";
             } else {
-                $relativeurl = "/file.php?file=/$relativepath/$file";
+                $relativeurl = "/file.php?file=/";
             }
+            $relativeurl .= $relativepath.'/'.rawurlencode($file);
             $filesize = display_size(filesize("$CFG->dataroot/$relativepath/$file"));
         }