Merge branch 'master' of https://github.com/ukko/kanboard into 1245_bug_with_subtask_timer

1 files changed, 9 insertions, 6 deletions

diff --git a/app/Api/File.php b/app/Api/File.php
index 97aa9d82..ad736ad4 100644
--- a/app/Api/File.php
+++ b/app/Api/File.php
@@ -2,6 +2,8 @@
 
 namespace Api;
 
+use Core\ObjectStorage\ObjectStorageException;
+
 /**
  * File API controller
  *
@@ -22,16 +24,17 @@ class File extends \Core\Base
 
     public function downloadFile($file_id)
     {
-        $file = $this->file->getById($file_id);
-
-        if (! empty($file)) {
+        try {
 
-            $filename = FILES_DIR.$file['path'];
+            $file = $this->file->getById($file_id);
 
-            if (file_exists($filename)) {
-                return base64_encode(file_get_contents($filename));
+            if (! empty($file)) {
+                return base64_encode($this->objectStorage->get($file['path']));
             }
         }
+        catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+        }
 
         return '';
     }