fixed bug #5533, could not choose from file root; merged from MOODLE_16_STABLE

diff --git a/files/index.php b/files/index.php
index 86546bdb5da2bb1dd48563bceccf6a72e31e4605..20a520527ec4084c66dc831e4f71883ff2ed95b6 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -757,16 +757,12 @@ function displaydir ($wdir) {
 
             $count++;
             $filename    = $fullpath."/".$file;
-            $fileurl     = "$wdir/$file";
+            $fileurl     = trim($wdir, "/")."/$file";
             $filesafe    = rawurlencode($file);
             $fileurlsafe = rawurlencode($fileurl);
             $filedate    = userdate(filemtime($filename), "%d %b %Y, %I:%M %p");
 
-            if (substr($fileurl,0,1) == '/') {
-                $selectfile = substr($fileurl,1);
-            } else {
-                $selectfile = $fileurl;
-            }
+            $selectfile = trim($fileurl, "/");
 
             echo "<tr class=\"file\">";