diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-18 20:40:46 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-18 20:40:46 +0100 |
| commit | d3fb01d8f762bc87fbbb352d75bfa634b74808d3 (patch) | |
| tree | ff60df616b66fc9d40b967ed157f8c6a6a0fbf89 | |
| parent | fd19ef7598a5d84485f4864bfcac36beef959a7c (diff) | |
| parent | 48659c2ce198a924b599191bf4b19d0014074f90 (diff) | |
| download | forums-d3fb01d8f762bc87fbbb352d75bfa634b74808d3.tar forums-d3fb01d8f762bc87fbbb352d75bfa634b74808d3.tar.gz forums-d3fb01d8f762bc87fbbb352d75bfa634b74808d3.tar.bz2 forums-d3fb01d8f762bc87fbbb352d75bfa634b74808d3.tar.xz forums-d3fb01d8f762bc87fbbb352d75bfa634b74808d3.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/phpbb/plupload/plupload.php | 2 | ||||
| -rw-r--r-- | tests/plupload/plupload_test.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index a47fc87adf..eb698fb35d 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -266,7 +266,7 @@ class plupload if ($this->config['img_max_height'] > 0 && $this->config['img_max_width'] > 0) { $resize = sprintf( - 'resize: {width: %d, height: %d, quality: 100},', + 'resize: {width: %d, height: %d, quality: 85},', (int) $this->config['img_max_width'], (int) $this->config['img_max_height'] ); diff --git a/tests/plupload/plupload_test.php b/tests/plupload/plupload_test.php index 3312f4d0a0..46bebb8d35 100644 --- a/tests/plupload/plupload_test.php +++ b/tests/plupload/plupload_test.php @@ -24,7 +24,7 @@ class phpbb_plupload_test extends phpbb_test_case array( 130, 150, - 'resize: {width: 130, height: 150, quality: 100},' + 'resize: {width: 130, height: 150, quality: 85},' ), ); } |