mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 19:29:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

use watermark if minX OR minY (not AND)

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@14581 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2012-04-30 09:46:50 +00:00
parent b219d87284
commit 9ba817a671
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/derivative_std_params.inc.php
View file

@ -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()