@@ -197,6 +197,4 @@ |
||
197 | 197 | } |
198 | 198 | } |
199 | 199 | |
200 | - return $images_property; |
|
201 | - } |
|
202 | -} |
|
200 | + return $images_property |
|
203 | 201 | \ No newline at end of file |
@@ -197,6 +197,4 @@ |
||
197 | 197 | } |
198 | 198 | } |
199 | 199 | |
200 | - return $images_property; |
|
201 | - } |
|
202 | -} |
|
200 | + return $images_property |
|
203 | 201 | \ No newline at end of file |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | $raw_filename = pathinfo($filenamewithextension, PATHINFO_FILENAME); //Retriving Image Raw Filename only |
20 | 20 | $filename = str_replace('-', '', $raw_filename); // Retrive Filename |
21 | 21 | $extension = $image_file->getClientOriginalExtension(); //Retriving Image extension |
22 | - $imageStoreNameOnly = $filename.'-'.time(); //Making Image Store name |
|
23 | - $imageStoreName = $filename.'-'.time().'.'.$extension; //Making Image Store name |
|
22 | + $imageStoreNameOnly = $filename . '-' . time(); //Making Image Store name |
|
23 | + $imageStoreName = $filename . '-' . time() . '.' . $extension; //Making Image Store name |
|
24 | 24 | |
25 | 25 | /* ------------------------------------------------------------------- */ |
26 | 26 | |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | ]); |
32 | 32 | /* --------------------------------------------------------------------------------------------- */ |
33 | 33 | |
34 | - $image = Image::cache(function ($cached_img) use ($image_file, $custom) { |
|
34 | + $image = Image::cache(function($cached_img) use ($image_file, $custom) { |
|
35 | 35 | return $cached_img->make($image_file->getRealPath())->fit($custom['width'] ?? config('thumbnail.img_width', 1000), $custom['height'] ?? config('thumbnail.img_height', 800)); //Parent Image Interventing |
36 | 36 | }, config('thumbnail.image_cached_time', 10), true); |
37 | - $image->save(public_path('storage/'.$this->$fieldname), $custom['quality'] ?? config('thumbnail.image_quality', 80)); // Parent Image Locating Save |
|
37 | + $image->save(public_path('storage/' . $this->$fieldname), $custom['quality'] ?? config('thumbnail.image_quality', 80)); // Parent Image Locating Save |
|
38 | 38 | |
39 | 39 | if (config('thumbnail.thumbnail', true)) { |
40 | 40 | $thumbnails = false; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $storage = $custom['storage'] ?? config('thumbnail.storage_path', 'uploads') ?? false; |
43 | 43 | if ($thumbnails) { |
44 | 44 | /* -----------------------------------------Custom Thumbnails------------------------------------------------- */ |
45 | -<<<<<<< HEAD |
|
45 | +<< << <<< HEAD |
|
46 | 46 | $this->makeCustomThumbnails($image_file, $imageStoreNameOnly, $extension, $storage, $thumbnails); |
47 | 47 | /* -------------------------------------------------------------------------------------------------- */ |
48 | 48 | ======= |
@@ -197,6 +197,4 @@ discard block |
||
197 | 197 | } |
198 | 198 | } |
199 | 199 | |
200 | - return $images_property; |
|
201 | - } |
|
202 | -} |
|
200 | + return $images_property |
|
203 | 201 | \ No newline at end of file |
@@ -197,6 +197,4 @@ |
||
197 | 197 | } |
198 | 198 | } |
199 | 199 | |
200 | - return $images_property; |
|
201 | - } |
|
202 | -} |
|
200 | + return $images_property |
|
203 | 201 | \ No newline at end of file |
@@ -197,6 +197,4 @@ |
||
197 | 197 | } |
198 | 198 | } |
199 | 199 | |
200 | - return $images_property; |
|
201 | - } |
|
202 | -} |
|
200 | + return $images_property |
|
203 | 201 | \ No newline at end of file |