diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-13 16:45:31 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-13 16:45:31 +0100 |
| commit | 0178840c19978cf4b0378609df0bcc004c6d36ae (patch) | |
| tree | c8a8bcb86661f6278e9e08439c9621638d387d1e /include/photo/photo_driver.php | |
| parent | d04c73ae0000bcd7cf854a936f25583355e78def (diff) | |
| parent | 5d0646c9e1f207fa05fd923bcccd9f5844de2664 (diff) | |
| download | volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.tar.gz volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.tar.bz2 volse-hubzilla-0178840c19978cf4b0378609df0bcc004c6d36ae.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/photo/photo_driver.php')
| -rw-r--r-- | include/photo/photo_driver.php | 11 |
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) { |