aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-12-16 17:02:16 +0000
committerpatdenice <patdenice@piwigo.org>2011-12-16 17:02:16 +0000
commit39410697f536e7c1c265b10a4bce4e0e79c0afee (patch)
treeccc2cb898005bc718e79eb4e85ae380658838fdd /include
parent2372b25a1c8d9a5db8e596c50959a0e5934af208 (diff)
merge r12749 from trunk to branch 2.3
bug:2535 Image is not cropped and ressized if requested size is bigger than image size. git-svn-id: http://piwigo.org/svn/branches/2.3@12750 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/ws_functions.inc.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 47b94da12..5e6abeca1 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -3250,6 +3250,11 @@ SELECT id, path, tn_ext, has_high
prepare_directory(dirname($thumb_path));
$img = new pwg_image($image_path, $params['library']);
+ if (!is_bool($params['crop']))
+ $params['crop'] = get_boolean($params['crop']);
+ if (!is_bool($params['follow_orientation']))
+ $params['follow_orientation'] = get_boolean($params['follow_orientation']);
+
$result = $img->pwg_resize(
$thumb_path,
$params['maxwidth'],
@@ -3257,8 +3262,8 @@ SELECT id, path, tn_ext, has_high
$params['quality'],
false, // automatic rotation is not needed for thumbnails.
true, // strip metadata
- get_boolean($params['crop']),
- get_boolean($params['follow_orientation'])
+ $params['crop'],
+ $params['follow_orientation']
);
$img->destroy();