aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-04-30 04:29:09 +0000
committerrvelices <rv-github@modusoptimus.com>2012-04-30 04:29:09 +0000
commitbb2a1fce5b94e6ed5d9f72ec1593577ebd4e5a35 (patch)
treedd786dcb37794bc8143e939734bd73db73a8a206 /include
parent2f1ebdc9c493628bdfe130b471e81629e1cd64a9 (diff)
fix apply_global function
git-svn-id: http://piwigo.org/svn/trunk@14550 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/derivative_std_params.inc.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/derivative_std_params.inc.php b/include/derivative_std_params.inc.php
index e1a15c882..6e0f119e3 100644
--- a/include/derivative_std_params.inc.php
+++ b/include/derivative_std_params.inc.php
@@ -164,12 +164,9 @@ final class ImageStdParams
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] );
}
private static function build_maps()