Merge branch 'MDL-52489_master' of git://github.com/markn86/moodle
[moodle.git] / mod / assign / submission / file / locallib.php
index cfc4558..e812536 100644 (file)
@@ -304,7 +304,7 @@ class assign_submission_file extends assign_submission_plugin {
                                      false);
 
         foreach ($files as $file) {
-            $result[$file->get_filename()] = $file;
+            $result[$file->get_filepath().$file->get_filename()] = $file;
         }
         return $result;
     }