diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2020-02-01 08:50:24 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-02-01 08:50:24 +0100 |
| commit | 2d5289ed7e126eeec22a9b1af977bfcd87371ec5 (patch) | |
| tree | c3d52befd5ab2c6f77530a1af2ffeff67b1d865c /phpBB/phpbb | |
| parent | Merge branch '3.3.x' (diff) | |
| parent | Merge branch '3.2.x' into 3.3.x (diff) | |
| download | phpbb-master.tar.gz phpbb-master.tar.bz2 phpbb-master.zip | |
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php | 30 | ||||
| -rw-r--r-- | phpBB/phpbb/plupload/plupload.php | 7 |
2 files changed, 35 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php b/phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php new file mode 100644 index 0000000000..d708155807 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php @@ -0,0 +1,30 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v32x; + +class add_plupload_config extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return ['\phpbb\db\migration\data\v32x\v329']; + } + + public function update_data() + { + return [ + ['config.add', ['img_quality', '85']], + ['config.add', ['img_strip_metadata', '0']], + ]; + } +} 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 ); } |