Changeset 14581

Timestamp:

04/30/12 11:46:50 (13 months ago)

Author:

plg

Message:

use watermark if minX OR minY (not AND)

Files:

• trunk/include/derivative_std_params.inc.php (modified) (1 diff)

trunk/include/derivative_std_params.inc.php

@@ -167 +167 @@
     $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] );
   }