Merge branch 'MDL-48929-master' of git://github.com/FMCorz/moodle

mvaraujo · Feb 3, 2015 · 48bac91 · 48bac91
2 parents f13e8ad + 413907c
commit 48bac91
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/repository/filesystem/lib.php b/repository/filesystem/lib.php
@@ -575,7 +575,7 @@ public function send_relative_file(stored_file $mainfile, $relativepath) {
             $fullrelativefilepath = realpath($this->get_rootpath().$basepath.$relativepath);
 
             // Sanity check to make sure this path is inside this repository and the file exists.
-            if (strpos($fullrelativefilepath, $this->get_rootpath()) === 0 && file_exists($fullrelativefilepath)) {
+            if (strpos($fullrelativefilepath, realpath($this->get_rootpath())) === 0 && file_exists($fullrelativefilepath)) {
                 send_file($fullrelativefilepath, basename($relativepath), null, 0);
             }
         }
@@ -665,4 +665,4 @@ function repository_filesystem_cron() {
             $instances[$itemid]->remove_obsolete_thumbnails($files);
         }
     }
-}
+}