aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
authorKYPREO <58344533+KYPREO@users.noreply.github.com>2020-01-20 22:16:38 +1100
committerKYPREO <58344533+KYPREO@users.noreply.github.com>2020-01-20 22:16:38 +1100
commit0b03fa963ac3cde9f7ddab10f8e68d1b6a6ab061 (patch)
tree8d9b129d1382cadbae40ed8a3f65eada3ce1f2f9 /phpBB
parent[ticket/16329] Add configuration options for Plupload (diff)
downloadphpbb-0b03fa963ac3cde9f7ddab10f8e68d1b6a6ab061.tar.gz
phpbb-0b03fa963ac3cde9f7ddab10f8e68d1b6a6ab061.tar.bz2
phpbb-0b03fa963ac3cde9f7ddab10f8e68d1b6a6ab061.zip
[ticket/16329] Add configuration options for Plupload
PHPBB3-16329 PHPBB3-16330
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php12
-rw-r--r--phpBB/phpbb/plupload/plupload.php26
2 files changed, 13 insertions, 25 deletions
diff --git a/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php b/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php
index a1405e55a0..c801097745 100644
--- a/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php
+++ b/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php
@@ -17,16 +17,14 @@ class enable_plupload_config extends \phpbb\db\migration\migration
{
static public function depends_on()
{
- return array(
- '\phpbb\db\migration\data\v32x\v329',
- );
+ return ['\phpbb\db\migration\data\v32x\v329',];
}
public function update_data()
{
- return array(
- array('config.add', array('img_quality', '90')),
- array('config.add', array('img_strip_metadata', '1')),
- );
+ return [
+ ['config.add', ['img_quality', '90']],
+ ['config.add', ['img_strip_metadata', '1']],
+ ];
}
}
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index b3484911a4..6f9e39c384 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -263,24 +263,14 @@ class plupload
$resize = '';
if ($this->config['img_max_height'] > 0 && $this->config['img_max_width'] > 0)
{
- 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']
- );
- }
+ $preserve_headers_value = $this->config['img_strip_metadata'] ? 'false' : 'true';
+ $resize = sprintf(
+ '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_quality'],
+ $preserve_headers_value
+ );
}
return $resize;