bug 2682: Watermark sizing calculation is made on the requested size not on the final one - fix

git-svn-id: http://piwigo.org/svn/trunk@16991 68402e56-0260-453c-a942-63ccdbb3a9ee

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;
   }