fixed // in course root when browsing files; merged from MOODLE_16_STABLE

diff --git a/files/index.php b/files/index.php
index fbcd8e9a29cab3208796f1cc759558ca81d9394d..76e455472f74a9f303957449f6a37b92ebae4f3d 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -769,9 +769,9 @@ function displaydir ($wdir) {
             print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />", 'checkbox');
             echo "<td align=\"left\" nowrap=\"nowrap\" class=\"name\">";
             if ($CFG->slasharguments) {
-                $ffurl = "/file.php/$id/$fileurl";
+                $ffurl = str_replace('//', '/', "/file.php/$id/$fileurl");
             } else {
-                $ffurl = "/file.php?file=/$id/$fileurl";
+                $ffurl = str_replace('//', '/', "/file.php?file=/$id/$fileurl");
             }
             link_to_popup_window ($ffurl, "display",
                                   "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"File\" />",