diff --git a/.idea/vcs.xml b/.idea/vcs.xml index a3835b65e4..bd69c239ca 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -3,6 +3,5 @@ - \ No newline at end of file diff --git a/app/Domain/Files/Repositories/Files.php b/app/Domain/Files/Repositories/Files.php index 5d99a2c116..df5d217333 100644 --- a/app/Domain/Files/Repositories/Files.php +++ b/app/Domain/Files/Repositories/Files.php @@ -4,7 +4,7 @@ use Illuminate\Contracts\Container\BindingResolutionException; use Leantime\Core\Db as DbCore; - use Leantime\Core\Fileupload as FileuploadCore; + use Leantime\Core\Fileupload; use Leantime\Domain\Users\Repositories\Users as UserRepo; use PDO; @@ -257,7 +257,7 @@ public function deleteFile($id): bool * @return array|false * @throws BindingResolutionException */ - public function upload($file, $module, $moduleId): false|array + public function upload($file, $module, $moduleId): false|string|array { //Clean module mess @@ -268,7 +268,7 @@ public function upload($file, $module, $moduleId): false|array $module = "ticket"; } - $upload = app()->make(FileuploadCore::class); + $upload = app()->make(Fileupload::class); $path = $file['file']['name']; $ext = pathinfo($path, PATHINFO_EXTENSION); @@ -303,9 +303,8 @@ public function upload($file, $module, $moduleId): false|array $return = false; } } else { - error_log($upload->error); - return false; + return $upload->error; } } diff --git a/app/Plugins b/app/Plugins index 82d4af492f..ae7b189f5e 160000 --- a/app/Plugins +++ b/app/Plugins @@ -1 +1 @@ -Subproject commit 82d4af492fb51871a4ab275994eba44939da8a48 +Subproject commit ae7b189f5e795bd4e05f21e5d7f244493f183a75