ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-16 14:50:48 +03:00
Code Issues Releases Wiki Activity

fix загрузки gif

Browse source
This commit is contained in:
Mzhelskiy Maxim 2017-03-17 13:41:28 +07:00
parent 7b9c373f9c
commit fc58a93929
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
application/classes/modules/media/Media.class.php
View file

@ -454,28 +454,38 @@ class ModuleMedia extends ModuleORM
*/
$sFileResult = null;
$mOriginalSize = $this->GetConfigParam('image.original', $sTargetType);
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)) {
if ($mOriginalSize !== false && $oImage->getFormat() == 'gif') {
/**
* Ресайзим оригинал
* Если gif, то сохраняем без изменений
*/
$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))
) {
if (!$sFileResult = $oImage->saveOriginalSmart($sPath, $sFileName)) {
$this->Fs_RemoveFileLocal($sFileTmp);
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);
/**
* Перед запуском генерации подчищаем память

2
framework

@ -1 +1 @@
Subproject commit 831c5e8949fbb7762324ead8c69db289c8bfeb6b
Subproject commit 8f08d14613dc258ffc8bb34e355794a412f87ba4