From 784f0d5f3bef6a7dc3c8750dfe1747cbae2da2ba Mon Sep 17 00:00:00 2001
From: 3D-I <eataly3d@gmail.com>
Date: Sat, 27 Feb 2021 04:28:48 +0100
Subject: [PATCH 1/2] [ticket/16710] Allow WEBP images in attachments

PHPBB3-16710
---
 phpBB/phpbb/files/upload.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index a1ce4ca283..13d5e420da 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -378,6 +378,7 @@ class upload
 			IMAGETYPE_IFF		=> array('iff'),
 			IMAGETYPE_WBMP		=> array('wbmp'),
 			IMAGETYPE_XBM		=> array('xbm'),
+			IMAGETYPE_WEBP		=> ['webp'],
 		);
 
 		if (defined('IMAGETYPE_SWC'))

From b5d1573acd2649b17b05769d90915e6d5bd25751 Mon Sep 17 00:00:00 2001
From: 3D-I <eataly3d@gmail.com>
Date: Sat, 27 Feb 2021 15:26:30 +0100
Subject: [PATCH 2/2] [ticket/16710] Allow WEBP images in attachments

Update the array syntax in the function itself

PHPBB3-16710
---
 phpBB/phpbb/files/upload.php | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index 13d5e420da..27e74ae9d7 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -362,28 +362,28 @@ class upload
 	 */
 	static public function image_types()
 	{
-		$result = array(
-			IMAGETYPE_GIF		=> array('gif'),
-			IMAGETYPE_JPEG		=> array('jpg', 'jpeg'),
-			IMAGETYPE_PNG		=> array('png'),
-			IMAGETYPE_SWF		=> array('swf'),
-			IMAGETYPE_PSD		=> array('psd'),
-			IMAGETYPE_BMP		=> array('bmp'),
-			IMAGETYPE_TIFF_II	=> array('tif', 'tiff'),
-			IMAGETYPE_TIFF_MM	=> array('tif', 'tiff'),
-			IMAGETYPE_JPC		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JP2		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JPX		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JB2		=> array('jpg', 'jpeg'),
-			IMAGETYPE_IFF		=> array('iff'),
-			IMAGETYPE_WBMP		=> array('wbmp'),
-			IMAGETYPE_XBM		=> array('xbm'),
+		$result = [
+			IMAGETYPE_GIF		=> ['gif'],
+			IMAGETYPE_JPEG		=> ['jpg', 'jpeg'],
+			IMAGETYPE_PNG		=> ['png'],
+			IMAGETYPE_SWF		=> ['swf'],
+			IMAGETYPE_PSD		=> ['psd'],
+			IMAGETYPE_BMP		=> ['bmp'],
+			IMAGETYPE_TIFF_II	=> ['tif', 'tiff'],
+			IMAGETYPE_TIFF_MM	=> ['tif', 'tiff'],
+			IMAGETYPE_JPC		=> ['jpg', 'jpeg'],
+			IMAGETYPE_JP2		=> ['jpg', 'jpeg'],
+			IMAGETYPE_JPX		=> ['jpg', 'jpeg'],
+			IMAGETYPE_JB2		=> ['jpg', 'jpeg'],
+			IMAGETYPE_IFF		=> ['iff'],
+			IMAGETYPE_WBMP		=> ['wbmp'],
+			IMAGETYPE_XBM		=> ['xbm'],
 			IMAGETYPE_WEBP		=> ['webp'],
-		);
+		];
 
 		if (defined('IMAGETYPE_SWC'))
 		{
-			$result[IMAGETYPE_SWC] = array('swc');
+			$result[IMAGETYPE_SWC] = ['swc'];
 		}
 
 		return $result;