mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'bantu/ticket/12673' into develop-ascraeus

Browse Source 
* bantu/ticket/12673:
  [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
This commit is contained in:
Marc Alexander 2014-06-08 22:17:56 +02:00
commit b667923bcc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/functions_upload.php
View File

@ -1051,7 +1051,7 @@ class fileupload
*/ */
static public function image_types() static public function image_types()
{ {
return array( $result = array(
IMAGETYPE_GIF => array('gif'), IMAGETYPE_GIF => array('gif'),
IMAGETYPE_JPEG => array('jpg', 'jpeg'), IMAGETYPE_JPEG => array('jpg', 'jpeg'),
IMAGETYPE_PNG => array('png'), IMAGETYPE_PNG => array('png'),
@ -1064,10 +1064,16 @@ class fileupload
IMAGETYPE_JP2 => array('jpg', 'jpeg'), IMAGETYPE_JP2 => array('jpg', 'jpeg'),
IMAGETYPE_JPX => array('jpg', 'jpeg'), IMAGETYPE_JPX => array('jpg', 'jpeg'),
IMAGETYPE_JB2 => array('jpg', 'jpeg'), IMAGETYPE_JB2 => array('jpg', 'jpeg'),
IMAGETYPE_SWC => array('swc'),
IMAGETYPE_IFF => array('iff'), IMAGETYPE_IFF => array('iff'),
IMAGETYPE_WBMP => array('wbmp'), IMAGETYPE_WBMP => array('wbmp'),
IMAGETYPE_XBM => array('xbm'), IMAGETYPE_XBM => array('xbm'),
); );
if (defined('IMAGETYPE_SWC'))
{
$result[IMAGETYPE_SWC] = array('swc');
}
return $result;
} }
} }