From 5aa0c30e0661356751d9eb4eb0c653571f55a975 Mon Sep 17 00:00:00 2001
From: Alexander Demidov <dimti@bk.ru>
Date: Fri, 24 Jan 2014 19:15:08 +0400
Subject: [PATCH] =?UTF-8?q?MIRSPORTA-80=20=D0=9F=D1=80=D0=BE=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0=20getWatermark=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Upload.class.php | 5 ++++-
 push-update.sh   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Upload.class.php b/Upload.class.php
index 6d5b05c..fe0c227 100644
--- a/Upload.class.php
+++ b/Upload.class.php
@@ -79,7 +79,10 @@ abstract class Upload
                 . ' ' . self::getFilePath($image_variant));
             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;
             $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();
diff --git a/push-update.sh b/push-update.sh
index e587322..9d02fe1 100755
--- a/push-update.sh
+++ b/push-update.sh
@@ -72,7 +72,7 @@ do
         then
             {
                 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
             } || {
                 echo -e "Failed to update dependency d753 branches... Please resolve that problem by hand\n"