Changeset 14550


Ignore:
Timestamp:
Apr 30, 2012, 6:29:09 AM (8 years ago)
Author:
rvelices
Message:

fix apply_global function

File:
1 edited

Legend:

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

    r14228 r14550  
    165165  static function apply_global($params)
    166166  {
    167     if (!empty(self::$watermark->file) &&
     167    $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] ) )
    170     {
    171       $params->use_watermark = true;
    172     }
     169        && self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] );
    173170  }
    174171
Note: See TracChangeset for help on using the changeset viewer.