Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 1d2ec19

Browse files
committed
Fix: Original Size Url
1 parent 2c1dd3a commit 1d2ec19

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/ImageType.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,11 @@ public function url(string $filename = null, $sizes = [], $expirationTime = null
187187
}
188188

189189
$urls = [];
190+
$filename = pathinfo($filename);
190191
$this->expirationTime = empty($expirationTime) ? $this->expirationTime : $expirationTime;
191192

192193
if (empty($sizes) || in_array('original', $sizes)) {
193-
$output = $this->typeConfig->get('original')['path'] . '/' . $filename;
194+
$output = $this->typeConfig->get('original')['path'] . '/' . $filename['basename'];
194195

195196
$storage = Storage::disk($this->originalFileDisk);
196197
if ($this->originalDiskConfig['driver'] === 'local' || empty($this->typeConfig->get('original')['private'])) {
@@ -200,7 +201,6 @@ public function url(string $filename = null, $sizes = [], $expirationTime = null
200201
}
201202
}
202203

203-
$filename = pathinfo($filename);
204204
$configSizes = $this->typeConfig->get('sizes');
205205

206206
if ($configSizes) {
@@ -222,14 +222,14 @@ public function temporaryUrl(string $filename = null, $sizes = [], $expirationTi
222222
}
223223

224224
$urls = [];
225+
$filename = pathinfo($filename);
225226
$this->expirationTime = empty($expirationTime) ? $this->expirationTime : $expirationTime;
226227

227228
if (empty($sizes) || in_array('original', $sizes)) {
228-
$output = $this->typeConfig->get('original')['path'] . '/' . $filename;
229+
$output = $this->typeConfig->get('original')['path'] . '/' . $filename['basename'];
229230
$urls['original'] = Storage::disk($this->originalFileDisk)->temporaryUrl($output, Carbon::now()->addMinutes($this->expirationTime));
230231
}
231232

232-
$filename = pathinfo($filename);
233233
$configSizes = $this->typeConfig->get('sizes');
234234

235235
if ($configSizes) {
@@ -247,14 +247,14 @@ public function temporaryUrl(string $filename = null, $sizes = [], $expirationTi
247247
public function blob(string $filename, $size = null)
248248
{
249249
$output = null;
250+
$filename = pathinfo($filename);
250251

251252
if (empty($size) || $size === 'original') {
252-
$output = $this->typeConfig->get('original')['path'] . '/' . $filename;
253+
$output = $this->typeConfig->get('original')['path'] . '/' . $filename['basename'];
253254
} else {
254255
$configSizes = $this->typeConfig->get('sizes');
255256

256257
if (isset($configSizes[$size])) {
257-
$filename = pathinfo($filename);
258258
$output = $this->output($filename, $size, $configSizes[$size]);
259259
}
260260
}

0 commit comments

Comments
 (0)