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

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2021-03-01 21:21:04 +01:00
commit 3629b587fa
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/includes/functions_posting.php
View File

@ -542,12 +542,17 @@ function get_supported_image_types($type = false)
case IMAGETYPE_WBMP:
$new_type = ($format & IMG_WBMP) ? IMG_WBMP : false;
break;
// WEBP
case IMAGETYPE_WEBP:
$new_type = ($format & IMG_WEBP) ? IMG_WEBP : false;
break;
}
}
else
{
$new_type = array();
$go_through_types = array(IMG_GIF, IMG_JPG, IMG_PNG, IMG_WBMP);
$new_type = [];
$go_through_types = [IMG_GIF, IMG_JPG, IMG_PNG, IMG_WBMP, IMG_WEBP];
foreach ($go_through_types as $check_type)
{
@ -558,14 +563,14 @@ function get_supported_image_types($type = false)
}
}
return array(
return [
'gd' => ($new_type) ? true : false,
'format' => $new_type,
'version' => (function_exists('imagecreatetruecolor')) ? 2 : 1
);
];
}
return array('gd' => false);
return ['gd' => false];
}
/**
@ -659,6 +664,10 @@ function create_thumbnail($source, $destination, $mimetype)
case IMG_WBMP:
$image = @imagecreatefromwbmp($source);
break;
case IMG_WEBP:
$image = @imagecreatefromwebp($source);
break;
}
if (empty($image))
@ -710,6 +719,10 @@ function create_thumbnail($source, $destination, $mimetype)
case IMG_WBMP:
imagewbmp($new_image, $destination);
break;
case IMG_WEBP:
imagewebp($new_image, $destination);
break;
}
imagedestroy($new_image);