diff options
| author | plegall <plg@piwigo.org> | 2012-04-30 09:46:50 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2012-04-30 09:46:50 +0000 |
| commit | 9ba817a671f3793ac1f738c002dd6de4313173d2 (patch) | |
| tree | e1ffaedef8b55a3da9427b3f69523e1e8077b338 /include/derivative_std_params.inc.php | |
| parent | b219d87284b1bca9fe2a0257544cd26e37043dac (diff) | |
use watermark if minX OR minY (not AND)
git-svn-id: http://piwigo.org/svn/trunk@14581 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/derivative_std_params.inc.php')
| -rw-r--r-- | include/derivative_std_params.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
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() |