MDL-11342: Urlencode the filepath in directory resource (merge from 1.9)

diff --git a/mod/resource/type/directory/resource.class.php b/mod/resource/type/directory/resource.class.php
index e517f0342251f8cd0cd057a0668afd69f6db6c82..a1fb4b3bb6cccd6324a450378cfcce81c153b626 100644 (file)
--- a/mod/resource/type/directory/resource.class.php
+++ b/mod/resource/type/directory/resource.class.php
@@ -126,12 +126,7 @@ function display() {
 
         } else {
             $icon = mimeinfo("icon", $file);
-
-            if ($CFG->slasharguments) {
-                $relativeurl = "/file.php/$relativepath/$file";
-            } else {
-                $relativeurl = "/file.php?file=/$relativepath/$file";
-            }
+            $relativeurl = get_file_url("$relativepath/$file");
             $filesize = display_size(filesize("$CFG->dataroot/$relativepath/$file"));
         }