aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-04-21 15:10:59 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-04-21 15:10:59 +0000
commit91d0c8b3bf41dfed42d8e33595c0e530a431db1c (patch)
tree025fdf94609a4875d691f3580c5bee7ef407f9bc /phpBB/includes/functions_posting.php
parentf2ba40f294d8e9e75a3adb78eedb2dc47633043e (diff)
downloadforums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar
forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.gz
forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.bz2
forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.xz
forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.zip
merge again, revisions 8516 to 8525
git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index a2482c64c4..7d9945684d 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;