aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-02-01 08:50:24 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-02-01 08:50:24 +0100
commit2d5289ed7e126eeec22a9b1af977bfcd87371ec5 (patch)
treec3d52befd5ab2c6f77530a1af2ffeff67b1d865c /phpBB/phpbb/plupload/plupload.php
parentMerge branch '3.3.x' (diff)
parentMerge branch '3.2.x' into 3.3.x (diff)
downloadphpbb-master.tar.gz
phpbb-master.tar.bz2
phpbb-master.zip
Merge branch '3.3.x'HEADmaster
Diffstat (limited to 'phpBB/phpbb/plupload/plupload.php')
-rw-r--r--phpBB/phpbb/plupload/plupload.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index 80d7e914db..a94fbb7617 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -263,10 +263,13 @@ class plupload
$resize = '';
if ($this->config['img_max_height'] > 0 && $this->config['img_max_width'] > 0)
{
+ $preserve_headers_value = $this->config['img_strip_metadata'] ? 'false' : 'true';
$resize = sprintf(
- 'resize: {width: %d, height: %d, quality: 85},',
+ 'resize: {width: %d, height: %d, quality: %d, preserve_headers: %s},',
(int) $this->config['img_max_width'],
- (int) $this->config['img_max_height']
+ (int) $this->config['img_max_height'],
+ (int) $this->config['img_quality'],
+ $preserve_headers_value
);
}