Changeset 14581


Ignore:
Timestamp:
04/30/12 11:46:50 (8 years ago)
Author:
plg
Message:

use watermark if minX OR minY (not AND)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/derivative_std_params.inc.php

    r14550 r14581  
    167167    $params->use_watermark = !empty(self::$watermark->file) && 
    168168        (self::$watermark->min_size[0]<=$params->sizing->ideal_size[0] 
    169         && self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] ); 
     169        or self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] ); 
    170170  } 
    171171 
Note: See TracChangeset for help on using the changeset viewer.