aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-10-14 10:44:45 +0000
committerpatdenice <patdenice@piwigo.org>2011-10-14 10:44:45 +0000
commitbf0f2b64465dfea23e742c406a4c5993ca55f89d (patch)
tree5033a681af772dfd5c47cd4f95aa1ca7397c077c /admin
parenta3f6ceae5dc239dc849f8b65ee3c16b5f6b13261 (diff)
merge r12443 from trunk to branch 2.3
Bug:2472 Thumbnails are not cropped during upload git-svn-id: http://piwigo.org/svn/branches/2.3@12444 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/include/functions_upload.inc.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php
index d82ae3881..67bd8dd30 100644
--- a/admin/include/functions_upload.inc.php
+++ b/admin/include/functions_upload.inc.php
@@ -381,7 +381,9 @@ SELECT
$conf['upload_form_thumb_maxheight'],
$conf['upload_form_thumb_quality'],
false,
- true
+ true,
+ $conf['upload_form_thumb_crop'],
+ $conf['upload_form_thumb_follow_orientation']
);
$img->destroy();