diff --git a/CHANGELOG.md b/CHANGELOG.md index 0675274..e829408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed - changed `$asset->url` to `$asset->getImageTransformSourcePath()` ([#3](https://github.com/codewithkyle/craft-jitter/issues/3)) +- changed file extension regex pattern from `/(\..*)$/` to `/(\..{1,4})$/` ([#3](https://github.com/codewithkyle/craft-jitter/issues/3)) ## [1.1.0] - 2020-10-26 diff --git a/src/services/Transform.php b/src/services/Transform.php index bfdbcff..399887d 100644 --- a/src/services/Transform.php +++ b/src/services/Transform.php @@ -173,13 +173,13 @@ public function transformImage(array $params, bool $clientAcceptsWebp): array $masterImage = $params['path']; } - preg_match("/(\..*)$/", $asset->filename, $matches); + preg_match("/(\..{1,4})$/", $asset->filename, $matches); $baseType = strtolower(ltrim($matches[0], ".")); // Build transform details $transform = $this->getImageTransformSettings($params, $masterImage, $asset); $uid = $this->buildTransformUid($transform); - $filename = preg_replace("/(\..*)$/", '', $asset->filename) . '-' . $uid; + $filename = preg_replace("/(\..{1,4})$/", '', $asset->filename) . '-' . $uid; // Create S3 client (if possible) $settings = []; @@ -225,7 +225,7 @@ public function transformImage(array $params, bool $clientAcceptsWebp): array $cleanName = preg_replace("/.*\//", '', $cleanName); $response['url'] = "/jitter/" . $cleanName; $response['type'] = 'local'; - preg_match("/(\..*)$/", $existingFile, $matches); + preg_match("/(\..{1,4})$/", $existingFile, $matches); $contentType = ltrim($matches[0], "."); switch ($contentType) { @@ -253,7 +253,7 @@ public function transformImage(array $params, bool $clientAcceptsWebp): array // Save the output if ($s3) { - preg_match("/(\..*)$/", $finalImage, $matches); + preg_match("/(\..{1,4})$/", $finalImage, $matches); $finalImageType = $matches[0]; $uri = "/" . str_replace('\\', '/', $finalImage); $uri = preg_replace("/.*\//", '', $uri); @@ -288,7 +288,7 @@ public function transformImage(array $params, bool $clientAcceptsWebp): array copy($finalImage, FileHelper::normalizePath($publicPath. DIRECTORY_SEPARATOR . $cleanName)); $response['url'] = "/jitter/" . $cleanName; $response['type'] = 'local'; - preg_match("/(\..*)$/", $finalImage, $matches); + preg_match("/(\..{1,4})$/", $finalImage, $matches); $contentType = ltrim($matches[0], "."); switch ($contentType) {