iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix apply_global function

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@14550 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-04-30 04:29:09 +00:00
parent 2f1ebdc9c4
commit bb2a1fce5b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/derivative_std_params.inc.php
View File

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