use watermark if minX OR minY (not AND)

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

Author: plegall

include/derivative_std_params.inc.php

@@ -166,7 +166,7 @@ static function apply_global($params)
   {
     $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()