From 9ba817a671f3793ac1f738c002dd6de4313173d2 Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 30 Apr 2012 09:46:50 +0000 Subject: use watermark if minX OR minY (not AND) git-svn-id: http://piwigo.org/svn/trunk@14581 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/derivative_std_params.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 6e0f119e3..45c45c2c6 100644 --- a/include/derivative_std_params.inc.php +++ b/include/derivative_std_params.inc.php @@ -166,7 +166,7 @@ final class ImageStdParams { $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] ); + or self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] ); } private static function build_maps() -- cgit v1.2.3