|
@@ -88,7 +88,7 @@ discard block |
|
|
block discarded – undo |
|
88
|
88
|
$mime_type = Mime::DEFAULT_TYPE; |
|
89
|
89
|
} |
|
90
|
90
|
|
|
91
|
|
- $filename = $download ? addcslashes(string: basename(path: $path), characters: '"') : ''; |
|
|
91
|
+ $filename = $download ? addcslashes(string : basename(path : $path), characters : '"') : ''; |
|
92
|
92
|
|
|
93
|
93
|
return $this->imageResponse(data: $filesystem->read(location: $path), mime_type: $mime_type, filename: $filename); |
|
94
|
94
|
} catch (UnableToReadFile | FilesystemException $ex) { |
|
@@ -147,7 +147,7 @@ discard block |
|
|
block discarded – undo |
|
147
|
147
|
$image = $this->imageManager()->read(input: $filesystem->readStream($path)); |
|
148
|
148
|
$watermark = $this->createWatermark(width: $image->width(), height: $image->height(), media_file: $media_file); |
|
149
|
149
|
$image = $this->addWatermark(image: $image, watermark: $watermark); |
|
150
|
|
- $filename = $download ? basename(path: $path) : ''; |
|
|
150
|
+ $filename = $download ? basename(path : $path) : ''; |
|
151
|
151
|
$quality = $this->extractImageQuality(image: $image, default: static::GD_DEFAULT_IMAGE_QUALITY); |
|
152
|
152
|
$data = $image->encodeByMediaType(type: $mime_type, quality: $quality)->toString(); |
|
153
|
153
|
|
Please login to merge, or discard this patch.