aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-12 16:57:02 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-12 16:57:02 -0800
commit22a650ade8b6c4472f9ad70337b69ee54e2c7c32 (patch)
treeac9a3a99019d1c044c7e971f16aea99bfad7e0cc
parent391807b46c3f54eb94b88c253d89d09bc7139989 (diff)
downloadvolse-hubzilla-22a650ade8b6c4472f9ad70337b69ee54e2c7c32.tar.gz
volse-hubzilla-22a650ade8b6c4472f9ad70337b69ee54e2c7c32.tar.bz2
volse-hubzilla-22a650ade8b6c4472f9ad70337b69ee54e2c7c32.zip
issue #154
-rw-r--r--include/photo/photo_driver.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 285cbc8fb..0de3b9c97 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -3,6 +3,17 @@
function photo_factory($data, $type = null) {
$ph = null;
+
+ $unsupported_types = array(
+ 'image/bmp',
+ 'image/vnd.microsoft.icon',
+ 'image/tiff',
+ 'image/svg+xml'
+ );
+
+ if($type && in_array(strtolower($type),$unsupported_types))
+ return null;
+
$ignore_imagick = get_config('system', 'ignore_imagick');
if(class_exists('Imagick') && !$ignore_imagick) {