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

MIRSPORTA-80

Browse Source 
Проверка существования метода getWatermark перед его использованием
This commit is contained in:
Alexander Demidov
2014-01-24 19:15:08 +04:00
parent d9ecbe455e
commit 5aa0c30e06
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Upload.class.php
View File

@ -79,7 +79,10 @@ abstract class Upload
. ' ' . self::getFilePath($image_variant)); . ' ' . self::getFilePath($image_variant));
ob_clean(); ob_clean();
} }
if ($image->getWatermark($size) && Config::get('PYTHON_PIL_PASTE')) { if (Config::get('PYTHON_PIL_PASTE') &&
function_exists(array($image, 'getWatermark')) &&
$image->getWatermark($size)
) {
$script_file_path = Config::get('PYTHON_PIL_PASTE')->script_file_path; $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) : ''; $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(); ob_start();

2
push-update.sh
View File

@ -72,7 +72,7 @@ do
then then
{ {
git push origin master > /dev/null && git push origin master > /dev/null &&
cd /var/www/d753/ && ./merge-from-master.sh > /dev/null cd /var/www/d753_predelanet/ && ./merge-from-master.sh > /dev/null
cd /var/www/d753_10ballov/ && ./merge-from-master.sh > /dev/null cd /var/www/d753_10ballov/ && ./merge-from-master.sh > /dev/null
} || { } || {
echo -e "Failed to update dependency d753 branches... Please resolve that problem by hand\n" echo -e "Failed to update dependency d753 branches... Please resolve that problem by hand\n"