Merge branch 'm28_MDL-48799_Incorrect_Legacy_Dir_Fallback' of https:/…

…/github.com/scara/moodle into MOODLE_28_STABLE
moodle · Feb 3, 2015 · 45acb77 · 45acb77
2 parents 9e98e66 + 48a515c
commit 45acb77
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/file.php b/file.php
@@ -87,7 +87,8 @@
     if (strrpos($fullpath, '/') !== strlen($fullpath) -1 ) {
         $fullpath .= '/';
     }
-    if (!$file = $fs->get_file_by_hash(sha1($fullpath.'/.'))) {
+    // Try to fallback to the directory named as the supposed file.
+    if (!$file = $fs->get_file_by_hash(sha1($fullpath.'.'))) {
         send_file_not_found();
     }
 }