diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 12:18:36 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 12:18:36 +0000 |
| commit | 76250ca55a20c49b3ff26424276b5e7cba3b5ec0 (patch) | |
| tree | 9c575b1966041b00dc47faac602d42edb5ba1e79 /phpBB | |
| parent | 0bb09825c8714338d03f861e83fa811c1dd5e4af (diff) | |
| download | forums-76250ca55a20c49b3ff26424276b5e7cba3b5ec0.tar forums-76250ca55a20c49b3ff26424276b5e7cba3b5ec0.tar.gz forums-76250ca55a20c49b3ff26424276b5e7cba3b5ec0.tar.bz2 forums-76250ca55a20c49b3ff26424276b5e7cba3b5ec0.tar.xz forums-76250ca55a20c49b3ff26424276b5e7cba3b5ec0.zip | |
#25925
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8517 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 11b348949d..091fcc0d09 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -97,6 +97,7 @@ <li>[Fix] Update correct theme for cached styles in style.php (Bug #25805)</li> <li>[Fix] Also add PHPBB_INSTALLED check to download/file.php for inline avatar delivery</li> <li>[Fix] Unable to login to some jabber server, reverted previous change (Bug #25095)</li> + <li>[Fix] Do not return BMP as valid image type for GD image manipulation (Bug #25925)</li> </ul> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 2f12732e8b..709516a2b0 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -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; |