From 0065604be4242b88795769f92d62563eeb55e936 Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Mon, 28 Sep 2015 16:20:22 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20Media=20#?=
 =?UTF-8?q?704?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/classes/actions/ActionBlog.class.php     | 4 ++--
 application/classes/actions/ActionSettings.class.php | 4 ++--
 application/classes/modules/media/Media.class.php    | 5 +++--
 framework                                            | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/classes/actions/ActionBlog.class.php b/application/classes/actions/ActionBlog.class.php
index 352e35be..5d5515b4 100644
--- a/application/classes/actions/ActionBlog.class.php
+++ b/application/classes/actions/ActionBlog.class.php
@@ -2093,8 +2093,8 @@ class ActionBlog extends Action
          * Храним две копии - мелкую для показа пользователю и крупную в качестве исходной для ресайза
          */
         $sDir = Config::Get('path.uploads.images') . "/tmp/blog/{$oBlog->getId()}";
-        if ($sFileOriginal = $oImage->resize(1000, null)->saveSmart($sDir, 'original')) {
-            if ($sFilePreview = $oImage->resize(350, null)->saveSmart($sDir, 'preview')) {
+        if ($sFileOriginal = $oImage->resize(1000, null)->saveSmart($sDir, 'original', array('skip_watermark' => true))) {
+            if ($sFilePreview = $oImage->resize(350, null)->saveSmart($sDir, 'preview', array('skip_watermark' => true))) {
                 list($iOriginalWidth, $iOriginalHeight) = @getimagesize($this->Fs_GetPathServer($sFileOriginal));
                 list($iWidth, $iHeight) = @getimagesize($this->Fs_GetPathServer($sFilePreview));
                 /**
diff --git a/application/classes/actions/ActionSettings.class.php b/application/classes/actions/ActionSettings.class.php
index 451448a9..ee3e6f5c 100644
--- a/application/classes/actions/ActionSettings.class.php
+++ b/application/classes/actions/ActionSettings.class.php
@@ -142,8 +142,8 @@ class ActionSettings extends Action
         $sDir = Config::Get('path.uploads.images') . "/tmp/userphoto/{$oUser->getId()}";
         $aPhotoSizes = $this->Media_ParsedImageSize(Config::Get('module.user.profile_photo_size'));
         $sSaveWidth = $aPhotoSizes['w'] > 1000 ? $aPhotoSizes['w'] : 1000;
-        if ($sFileOriginal = $oImage->resize($sSaveWidth, null)->saveSmart($sDir, 'original')) {
-            if ($sFilePreview = $oImage->resize(350, null)->saveSmart($sDir, 'preview')) {
+        if ($sFileOriginal = $oImage->resize($sSaveWidth, null)->saveSmart($sDir, 'original', array('skip_watermark' => true))) {
+            if ($sFilePreview = $oImage->resize(350, null)->saveSmart($sDir, 'preview', array('skip_watermark' => true))) {
                 list($iOriginalWidth, $iOriginalHeight) = @getimagesize($this->Fs_GetPathServer($sFileOriginal));
                 list($iWidth, $iHeight) = @getimagesize($this->Fs_GetPathServer($sFilePreview));
                 /**
diff --git a/application/classes/modules/media/Media.class.php b/application/classes/modules/media/Media.class.php
index 881dfb19..68b1f135 100644
--- a/application/classes/modules/media/Media.class.php
+++ b/application/classes/modules/media/Media.class.php
@@ -449,11 +449,12 @@ class ModuleMedia extends ModuleORM
         $sFileName = func_generator(20);
         /**
          * Сохраняем оригинальную копию
+         * Оригинал храним без вотермарка
          */
         $sFileResult = null;
         $mOriginalSize = $this->GetConfigParam('image.original', $sTargetType);
         if ($mOriginalSize === true) {
-            if (!$sFileResult = $oImage->saveSmart($sPath, $sFileName)) {
+            if (!$sFileResult = $oImage->saveSmart($sPath, $sFileName, array('skip_watermark' => true))) {
                 $this->Fs_RemoveFileLocal($sFileTmp);
                 return $this->Image_GetLastError();
             }
@@ -465,7 +466,7 @@ class ModuleMedia extends ModuleORM
             if ($aOriginalSize['crop']) {
                 $oImage->cropProportion($aOriginalSize['w'] / $aOriginalSize['h'], 'center');
             }
-            if (!$sFileResult = $oImage->resize($aOriginalSize['w'], $aOriginalSize['h'], true)->saveSmart($sPath, $sFileName)
+            if (!$sFileResult = $oImage->resize($aOriginalSize['w'], $aOriginalSize['h'], true)->saveSmart($sPath, $sFileName, array('skip_watermark' => true))
             ) {
                 $this->Fs_RemoveFileLocal($sFileTmp);
                 return $this->Image_GetLastError();
diff --git a/framework b/framework
index 19d7f480..54f76be0 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 19d7f4801f4c6a3ef835c30041645849d5dc891d
+Subproject commit 54f76be0b09c5e126f13628b5e73e63c49734318