use objects instead of idstic-4946

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/models/Courseware/Filesystem/PublicFolder.php b/lib/models/Courseware/Filesystem/PublicFolder.php
index 10af85c..535b5f3 100644
--- a/lib/models/Courseware/Filesystem/PublicFolder.php
+++ b/lib/models/Courseware/Filesystem/PublicFolder.php
@@ -4,6 +4,8 @@ namespace Courseware\Filesystem;
 
 use ArrayAccess;
 use Courseware\Instance;
+use File;
+use FileRef;
 use FileType;
 use Flexi\Template;
 use Folder;
@@ -216,7 +218,7 @@ class PublicFolder extends StandardFolder
     /**
      * {@inheritdoc}
      */
-    public function isFileDownloadable(string $file_ref_id, string $user_id): bool
+    public function isFileDownloadable(FileRef $file_ref, string $user_id): bool
     {
         return true;
     }
@@ -224,7 +226,7 @@ class PublicFolder extends StandardFolder
     /**
      * {@inheritdoc}
      */
-    public function isFileEditable(string $file_ref_id, string $user_id): bool
+    public function isFileEditable(FileRef $file_ref, string $user_id): bool
     {
         return false;
     }
@@ -232,7 +234,7 @@ class PublicFolder extends StandardFolder
     /**
      * {@inheritdoc}
      */
-    public function isFileWritable(string $file_ref_id, string $user_id): bool
+    public function isFileWritable(FileRef $file_ref, string $user_id): bool
     {
         return false;
     }
diff --git a/lib/models/vips/Exercise.php b/lib/models/vips/Exercise.php
index bb142cc..9a5f5c1 100644
--- a/lib/models/vips/Exercise.php
+++ b/lib/models/vips/Exercise.php
@@ -814,7 +814,7 @@ abstract class Exercise extends SimpleORMap
                     if ($file_ref) {
                         $folder = $file_ref->folder->getTypedFolder();
 
-                        if ($folder->isFileDownloadable($file_ref->id, $GLOBALS['user']->id)) {
+                        if ($folder->isFileDownloadable($file_ref, $GLOBALS['user']->id)) {
                             if (!$this->folder->file_refs->find($file_id)) {
                                 $file = $file_ref->file;
                                 // $this->files->append($file);