Changeset 14550 for trunk/include/derivative_std_params.inc.php

Timestamp:

04/30/12 06:29:09 (13 months ago)

Author:

rvelices

Message:

fix apply_global function

Files:

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

trunk/include/derivative_std_params.inc.php

@@ -165 +165 @@
   static function apply_global($params)
   {
-    if (!empty(self::$watermark->file) &&
+    $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] ) )
-    {
-      $params->use_watermark = true;
-    }
+        && self::$watermark->min_size[1]<=$params->sizing->ideal_size[1] );
   }