mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-02-01 08:50:24 +01:00
parent c221858fab 3bb2edd53d
commit 2d5289ed7e
6 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php Normal file
View File

@@ -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']],
];
}
}

7
phpBB/phpbb/plupload/plupload.php
View File

@@ -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
);
}