diff --git a/app/Http/Controllers/Common/Uploads.php b/app/Http/Controllers/Common/Uploads.php index e7940aa3b..894f597d7 100644 --- a/app/Http/Controllers/Common/Uploads.php +++ b/app/Http/Controllers/Common/Uploads.php @@ -27,11 +27,11 @@ class Uploads extends Controller } // Get file path - if (!$path = $this->getMediaPathOnStorage($media)) { + if (!$this->getMediaPathOnStorage($media)) { return response(null, 204); } - return $this->streamMedia($media, $path); + return $this->streamMedia($media); } /** @@ -70,7 +70,7 @@ class Uploads extends Controller } // Get file path - if (!$path = $this->getMediaPathOnStorage($media)) { + if (!$this->getMediaPathOnStorage($media)) { return response()->json([ 'success' => false, 'error' => true, @@ -108,11 +108,11 @@ class Uploads extends Controller } // Get file path - if (!$path = $this->getMediaPathOnStorage($media)) { + if (!$this->getMediaPathOnStorage($media)) { return false; } - return $this->streamMedia($media, $path); + return $this->streamMedia($media); } /** diff --git a/app/Traits/Uploads.php b/app/Traits/Uploads.php index fd1fd80c4..d0b26aa31 100644 --- a/app/Traits/Uploads.php +++ b/app/Traits/Uploads.php @@ -100,10 +100,10 @@ trait Uploads return false; } - return Storage::path($path); + return $path; } - public function streamMedia($media, $path = '') + public function streamMedia($media) { return response()->streamDownload( function() use ($media) {