mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-30 02:40:42 +02:00
Code Issues Releases Wiki Activity

v2.11.0: Fix error when resizing webp images after webp conversion

Browse Source
This commit is contained in:
trendschau
2024-11-12 17:21:51 +01:00
parent d593f58678
commit c648f7fe63
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/typemill/Assets.php
View File

@@ -33,6 +33,8 @@ class Assets
public $meta;
public $media;
public $imageUrl;
public $imageFolder;

21
system/typemill/Models/Media.php
View File

@@ -507,6 +507,7 @@ class Media
}
$extension = $this->getExtension();
$origExtension = $extension;
$originalName = $this->getFilename();
$originalFile = $originalName . '.' . $extension;
$customName = $forcename ? $forcename . $resizeName : $originalName . $resizeName;
@@ -529,12 +530,17 @@ class Media
{
$imagePath = $storage->getFolderPath('originalFolder') . $originalFile;
}
elseif($origExtension = $this->findImageWithName($originalName, $storage))
{
$originalFile = $originalName . '.' . $origExtension;
$imagePath = $storage->getFolderPath('originalFolder') . $originalFile;
}
else
{
return 'image not found';
}
$image = $this->createImageFromPath($imagePath, $extension);
$image = $this->createImageFromPath($imagePath, $origExtension);
$originalSize = $this->getImageSize($image);
$resizedImage = $this->resizeImage($image, $desiredSize, $originalSize);
@@ -546,6 +552,19 @@ class Media
return 'error resizing image';
}
private function findImageWithName($originalName, $storage)
{
foreach($this->allowedExtensions as $extension => $bool)
{
$filename = $originalName . '.' . $extension;
if($storage->checkFile('originalFolder', '', $filename))
{
return $extension;
}
}
return false;
}
public function createGrayscale($imageUrl)
{
$this->setPathInfo($imageUrl);