aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-07-24 20:54:52 +0000
committerrvelices <rv-github@modusoptimus.com>2012-07-24 20:54:52 +0000
commit1c948a7fd5e49f002ae72839067b1a58fdb38566 (patch)
tree45e747693b0bdb9dbfd521fa2a301890a430321f
parent663f6273a714b4fc5468a1d6787d6a529fad1d60 (diff)
bug 2682: Watermark sizing calculation is made on the requested size not on the final one - fix (merge from trunk)
git-svn-id: http://piwigo.org/svn/branches/2.4@16992 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/derivative_params.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/derivative_params.inc.php b/include/derivative_params.inc.php
index b29255c53..82b197ee9 100644
--- a/include/derivative_params.inc.php
+++ b/include/derivative_params.inc.php
@@ -288,7 +288,7 @@ final class DerivativeParams
{
$min_size = ImageStdParams::get_watermark()->min_size;
return $min_size[0]<=$out_size[0]
- && $min_size[1]<=$$out_size[1];
+ || $min_size[1]<=$$out_size[1];
}
return false;
}