Merge branch '3.1.x' into 3.2.x

marc1706 · marc1706 · commit d3fb01d8f762 · 2016-12-18T20:40:46.000+01:00
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
@@ -266,7 +266,7 @@ public function generate_resize_string()
 		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
@@ -24,7 +24,7 @@ public function generate_resize_string_data()
 			array(
 				130,
 				150,
-				'resize: {width: 130, height: 150, quality: 100},'
+				'resize: {width: 130, height: 150, quality: 85},'
 			),
 		);
 	}

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public function generate_resize_string()`
`266`	`266`	`if ($this->config['img_max_height'] > 0 && $this->config['img_max_width'] > 0)`
`267`	`267`	`{`
`268`	`268`	`$resize = sprintf(`
`269`		`- 'resize: {width: %d, height: %d, quality: 100},',`
	`269`	`+ 'resize: {width: %d, height: %d, quality: 85},',`
`270`	`270`	`(int) $this->config['img_max_width'],`
`271`	`271`	`(int) $this->config['img_max_height']`
`272`	`272`	`);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function generate_resize_string_data()`
`24`	`24`	`array(`
`25`	`25`	`130,`
`26`	`26`	`150,`
`27`		`- 'resize: {width: 130, height: 150, quality: 100},'`
	`27`	`+ 'resize: {width: 130, height: 150, quality: 85},'`
`28`	`28`	`),`
`29`	`29`	`);`
`30`	`30`	`}`