mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-18 06:38:43 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2021-02-27 16:31:35 +01:00
commit febe2c6d2d
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
phpBB/phpbb/files/upload.php
View File

@ -356,27 +356,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;