mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
merge again, revisions 8516 to 8525
git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -524,6 +524,8 @@ function get_supported_image_types($type = false)
|
||||
|
||||
if ($type !== false)
|
||||
{
|
||||
// Type is one of the IMAGETYPE constants - it is fetched from getimagesize()
|
||||
// We do not use the constants here, because some were not available in PHP 4.3.x
|
||||
switch ($type)
|
||||
{
|
||||
// GIF
|
||||
@@ -545,8 +547,7 @@ function get_supported_image_types($type = false)
|
||||
$new_type = ($format & IMG_PNG) ? IMG_PNG : false;
|
||||
break;
|
||||
|
||||
// BMP, WBMP
|
||||
case 6:
|
||||
// WBMP
|
||||
case 15:
|
||||
$new_type = ($format & IMG_WBMP) ? IMG_WBMP : false;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user