diff --git a/src/Http/Controllers/ContentTypes/File.php b/src/Http/Controllers/ContentTypes/File.php index 3dbe93eddc..dcded81bd3 100644 --- a/src/Http/Controllers/ContentTypes/File.php +++ b/src/Http/Controllers/ContentTypes/File.php @@ -44,7 +44,7 @@ public function handle() */ protected function generatePath() { - return $this->slug.DIRECTORY_SEPARATOR.date('FY').DIRECTORY_SEPARATOR; + return $this->slug.DIRECTORY_SEPARATOR; } /** diff --git a/src/Http/Controllers/ContentTypes/Image.php b/src/Http/Controllers/ContentTypes/Image.php index 054e8b1f04..3ffe7817ea 100644 --- a/src/Http/Controllers/ContentTypes/Image.php +++ b/src/Http/Controllers/ContentTypes/Image.php @@ -14,7 +14,7 @@ public function handle() if ($this->request->hasFile($this->row->field)) { $file = $this->request->file($this->row->field); - $path = $this->slug.DIRECTORY_SEPARATOR.date('FY').DIRECTORY_SEPARATOR; + $path = $this->slug.DIRECTORY_SEPARATOR; $filename = $this->generateFileName($file, $path); diff --git a/src/Http/Controllers/ContentTypes/MultipleImage.php b/src/Http/Controllers/ContentTypes/MultipleImage.php index 4e6a6660a5..e828882f12 100644 --- a/src/Http/Controllers/ContentTypes/MultipleImage.php +++ b/src/Http/Controllers/ContentTypes/MultipleImage.php @@ -48,7 +48,7 @@ public function handle() $resize_quality = intval($this->options->quality ?? 75); $filename = Str::random(20); - $path = $this->slug.DIRECTORY_SEPARATOR.date('FY').DIRECTORY_SEPARATOR; + $path = $this->slug.DIRECTORY_SEPARATOR; array_push($filesPath, $path.$filename.'.'.$file->getClientOriginalExtension()); $filePath = $path.$filename.'.'.$file->getClientOriginalExtension(); diff --git a/src/Http/Controllers/VoyagerController.php b/src/Http/Controllers/VoyagerController.php index 1083d2deb8..31faa0c546 100644 --- a/src/Http/Controllers/VoyagerController.php +++ b/src/Http/Controllers/VoyagerController.php @@ -39,7 +39,7 @@ public function upload(Request $request) abort(403); } - $path = $slug.'/'.date('FY').'/'; + $path = $slug.'/'; $filename = basename($file->getClientOriginalName(), '.'.$file->getClientOriginalExtension()); $filename_counter = 1; @@ -90,7 +90,7 @@ public function assets(Request $request) $normalizer = new \League\Flysystem\WhitespacePathNormalizer(); $path = dirname(__DIR__, 3).'/publishable/assets/'. $normalizer->normalizePath(urldecode($request->path)); } - + } catch (\LogicException $e) { abort(404); }