aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/phpbb/plupload/plupload.php')
-rw-r--r--phpBB/phpbb/plupload/plupload.php23
1 files changed, 18 insertions, 5 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index 5a5b8a1874..b3484911a4 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -263,11 +263,24 @@ class plupload
$resize = '';
if ($this->config['img_max_height'] > 0 && $this->config['img_max_width'] > 0)
{
- $resize = sprintf(
- 'resize: {width: %d, height: %d, quality: 85},',
- (int) $this->config['img_max_width'],
- (int) $this->config['img_max_height']
- );
+ if ($this->config['img_strip_metadata'] == 1)
+ {
+ $resize = sprintf(
+ 'resize: {width: %d, height: %d, quality: %d, preserve_headers: false},',
+ (int) $this->config['img_max_width'],
+ (int) $this->config['img_max_height'],
+ (int) $this->config['img_quality']
+ );
+ }
+ else
+ {
+ $resize = sprintf(
+ 'resize: {width: %d, height: %d, quality: %d},',
+ (int) $this->config['img_max_width'],
+ (int) $this->config['img_max_height'],
+ (int) $this->config['img_quality']
+ );
+ }
}
return $resize;