wpstudio/image
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Откат детайлей

Browse Source
This commit is contained in:
Alexander Demidov
2014-05-07 21:52:16 +04:00
parent f78d7e5de9
commit 9362005000
2 changed files with 70 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Upload.class.php
View File

@ -70,14 +70,14 @@ abstract class Upload
if (Config::get('PYTHON_PIL_RESIZE')) {
$script_file_path = Config::get('PYTHON_PIL_RESIZE')->script_file_path;
$pil_options = isset(Config::get('PYTHON_PIL_RESIZE')->pil_options) ? ' ' . implode(' ', Config::get('PYTHON_PIL_RESIZE')->pil_options) : '';
ob_start();
exec($script_file_path
// ob_start();
passthru($script_file_path
. (($size_parts[0])?' --width=' . $size_parts[0]:'')
. (($size_parts[1])?' --height=' . $size_parts[1]:'')
. $pil_options
. ' ' . self::getFilePath($image)
. ' ' . self::getFilePath($image_variant));
ob_clean();
// ob_clean();
}
if (Config::get('PYTHON_PIL_PASTE') &&
function_exists(array($image, 'getWatermark')) &&
@ -85,12 +85,12 @@ abstract class Upload
) {
$script_file_path = Config::get('PYTHON_PIL_PASTE')->script_file_path;
$pil_options = (isset(Config::get('PYTHON_PIL_PASTE')->pil_options) && Config::get('PYTHON_PIL_PASTE')->pil_options) ? ' ' . implode(' ', Config::get('PYTHON_PIL_PASTE')->pil_options) : '';
ob_start();
exec($script_file_path
// ob_start();
passthru($script_file_path
. $pil_options
. ' ' . self::getFilePath($image_variant)
. ' ' . Config::get('PATH_WEB_ROOT') . '/' . $image->getWatermark($size));
ob_clean();
// ob_clean();
}
}