Merge pull request #3533 from Elsensee/ticket/13756

[ticket/13756] Fix resize after upload with plupload

phpBB/phpbb/plupload/plupload.php

@@ -267,8 +267,8 @@ class plupload
 		{
 			$resize = sprintf(
 				'resize: {width: %d, height: %d, quality: 100},',
-				(int) $this->config['img_max_height'],
+				(int) $this->config['img_max_width'],
-				(int) $this->config['img_max_width']
+				(int) $this->config['img_max_height']
 			);
 		}
 

tests/plupload/plupload_test.php

@@ -0,0 +1,53 @@
+<?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.
+ *
+ */
+
+class phpbb_plupload_test extends phpbb_test_case
+{
+	public function generate_resize_string_data()
+	{
+		return array(
+			array(
+				0,
+				0,
+				'',
+			),
+			array(
+				130,
+				150,
+				'resize: {width: 130, height: 150, quality: 100},'
+			),
+		);
+	}
+
+	/**
+	* @dataProvider generate_resize_string_data
+	*/
+	public function test_generate_resize_string($config_width, $config_height, $expected)
+	{
+		$config = new \phpbb\config\config(array(
+			'img_max_width'		=> $config_width,
+			'img_max_height'	=> $config_height,
+			'upload_path'		=> 'files',
+		));
+		$plupload = new \phpbb\plupload\plupload(
+			'',
+			$config,
+			new phpbb_mock_request,
+			new \phpbb\user('\phpbb\datetime'),
+			new \phpbb\php\ini,
+			new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\extension_guesser))
+		);
+
+		$this->assertEquals($expected, $plupload->generate_resize_string());
+	}
+}