mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-06-26 03:30:48 +03:00
fix загрузки gif
This commit is contained in:
parent
7b9c373f9c
commit
fc58a93929
|
@ -454,28 +454,38 @@ class ModuleMedia extends ModuleORM
|
||||||
*/
|
*/
|
||||||
$sFileResult = null;
|
$sFileResult = null;
|
||||||
$mOriginalSize = $this->GetConfigParam('image.original', $sTargetType);
|
$mOriginalSize = $this->GetConfigParam('image.original', $sTargetType);
|
||||||
if ($mOriginalSize === true) {
|
if ($mOriginalSize !== false && $oImage->getFormat() == 'gif') {
|
||||||
if (!$sFileResult = $oImage->saveSmart($sPath, $sFileName, array('skip_watermark' => true))) {
|
|
||||||
$this->Fs_RemoveFileLocal($sFileTmp);
|
|
||||||
return $this->Image_GetLastError();
|
|
||||||
}
|
|
||||||
} elseif (is_string($mOriginalSize)) {
|
|
||||||
/**
|
/**
|
||||||
* Ресайзим оригинал
|
* Если gif, то сохраняем без изменений
|
||||||
*/
|
*/
|
||||||
$aOriginalSize = $this->ParsedImageSize($mOriginalSize);
|
if (!$sFileResult = $oImage->saveOriginalSmart($sPath, $sFileName)) {
|
||||||
if ($aOriginalSize['crop']) {
|
|
||||||
$oImage->cropProportion($aOriginalSize['w'] / $aOriginalSize['h'], 'center');
|
|
||||||
}
|
|
||||||
if (!$sFileResult = $oImage->resize($aOriginalSize['w'], $aOriginalSize['h'], true)->saveSmart($sPath, $sFileName, array('skip_watermark' => true))
|
|
||||||
) {
|
|
||||||
$this->Fs_RemoveFileLocal($sFileTmp);
|
$this->Fs_RemoveFileLocal($sFileTmp);
|
||||||
return $this->Image_GetLastError();
|
return $this->Image_GetLastError();
|
||||||
}
|
}
|
||||||
$iFileSize = $this->Fs_GetFileSize($sFileResult);
|
} else {
|
||||||
|
if ($mOriginalSize === true) {
|
||||||
|
if (!$sFileResult = $oImage->saveSmart($sPath, $sFileName, array('skip_watermark' => true))) {
|
||||||
|
$this->Fs_RemoveFileLocal($sFileTmp);
|
||||||
|
return $this->Image_GetLastError();
|
||||||
|
}
|
||||||
|
} elseif (is_string($mOriginalSize)) {
|
||||||
|
/**
|
||||||
|
* Ресайзим оригинал
|
||||||
|
*/
|
||||||
|
$aOriginalSize = $this->ParsedImageSize($mOriginalSize);
|
||||||
|
if ($aOriginalSize['crop']) {
|
||||||
|
$oImage->cropProportion($aOriginalSize['w'] / $aOriginalSize['h'], 'center');
|
||||||
|
}
|
||||||
|
if (!$sFileResult = $oImage->resize($aOriginalSize['w'], $aOriginalSize['h'], true)->saveSmart($sPath, $sFileName,
|
||||||
|
array('skip_watermark' => true))
|
||||||
|
) {
|
||||||
|
$this->Fs_RemoveFileLocal($sFileTmp);
|
||||||
|
return $this->Image_GetLastError();
|
||||||
|
}
|
||||||
|
$iFileSize = $this->Fs_GetFileSize($sFileResult);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$aSizes = $this->GetConfigParam('image.sizes', $sTargetType);
|
$aSizes = $this->GetConfigParam('image.sizes', $sTargetType);
|
||||||
/**
|
/**
|
||||||
* Перед запуском генерации подчищаем память
|
* Перед запуском генерации подчищаем память
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 831c5e8949fbb7762324ead8c69db289c8bfeb6b
|
Subproject commit 8f08d14613dc258ffc8bb34e355794a412f87ba4
|
Loading…
Reference in a new issue