From bb2a1fce5b94e6ed5d9f72ec1593577ebd4e5a35 Mon Sep 17 00:00:00 2001 From: rvelices Date: Mon, 30 Apr 2012 04:29:09 +0000 Subject: fix apply_global function git-svn-id: http://piwigo.org/svn/trunk@14550 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/derivative_std_params.inc.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'include/derivative_std_params.inc.php') diff --git a/include/derivative_std_params.inc.php b/include/derivative_std_params.inc.php index e1a15c882..6e0f119e3 100644 --- a/include/derivative_std_params.inc.php +++ b/include/derivative_std_params.inc.php @@ -164,12 +164,9 @@ final class ImageStdParams static function apply_global($params) { - if (!empty(self::$watermark->file) && + $params->use_watermark = !empty(self::$watermark->file) && (self::$watermark->min_size[0]<=$params->sizing->ideal_size[0] - && self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] ) ) - { - $params->use_watermark = true; - } + && self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] ); } private static function build_maps() -- cgit v1.2.3