diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-06-08 22:18:34 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-08 22:18:34 +0200 |
| commit | be638e2a18b187b9023729bd256b803e19c61f10 (patch) | |
| tree | 3c25934dd64b7e423dfa0fec13571aefde61f199 | |
| parent | 9e00aef34a02f2446101bcc7d3697d023f58af84 (diff) | |
| parent | b667923bccfc84c4aeb799e16e6abbf0859e481c (diff) | |
| download | forums-be638e2a18b187b9023729bd256b803e19c61f10.tar forums-be638e2a18b187b9023729bd256b803e19c61f10.tar.gz forums-be638e2a18b187b9023729bd256b803e19c61f10.tar.bz2 forums-be638e2a18b187b9023729bd256b803e19c61f10.tar.xz forums-be638e2a18b187b9023729bd256b803e19c61f10.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
| -rw-r--r-- | phpBB/includes/functions_upload.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 94eef89c05..c640865212 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -1051,7 +1051,7 @@ class fileupload */ static public function image_types() { - return array( + $result = array( IMAGETYPE_GIF => array('gif'), IMAGETYPE_JPEG => array('jpg', 'jpeg'), IMAGETYPE_PNG => array('png'), @@ -1064,10 +1064,16 @@ class fileupload IMAGETYPE_JP2 => array('jpg', 'jpeg'), IMAGETYPE_JPX => array('jpg', 'jpeg'), IMAGETYPE_JB2 => array('jpg', 'jpeg'), - IMAGETYPE_SWC => array('swc'), IMAGETYPE_IFF => array('iff'), IMAGETYPE_WBMP => array('wbmp'), IMAGETYPE_XBM => array('xbm'), ); + + if (defined('IMAGETYPE_SWC')) + { + $result[IMAGETYPE_SWC] = array('swc'); + } + + return $result; } } |