aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-06-08 22:17:56 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-06-08 22:17:56 +0200
commitb667923bccfc84c4aeb799e16e6abbf0859e481c (patch)
treeedeed0f30937d1289a8bf0116c78b8f41e966bf0
parentfc4275ab2b414e184007a8791c7ee09537d5a827 (diff)
parentae35c4b05c7249d1d712592903e75a65e8cb7c84 (diff)
downloadforums-b667923bccfc84c4aeb799e16e6abbf0859e481c.tar
forums-b667923bccfc84c4aeb799e16e6abbf0859e481c.tar.gz
forums-b667923bccfc84c4aeb799e16e6abbf0859e481c.tar.bz2
forums-b667923bccfc84c4aeb799e16e6abbf0859e481c.tar.xz
forums-b667923bccfc84c4aeb799e16e6abbf0859e481c.zip
Merge remote-tracking branch 'bantu/ticket/12673' into develop-ascraeus
* bantu/ticket/12673: [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
-rw-r--r--phpBB/includes/functions_upload.php10
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;
}
}