diff options
| author | mrjive <mrjive@mrjive.it> | 2015-12-04 10:32:14 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-12-04 10:32:14 +0100 |
| commit | 051346325609f5f2e78ef0deaf182c65d7823bbc (patch) | |
| tree | f3660377b3daf6599623d2e4fb95b4d33c30d8cc /include/photo/photo_driver.php | |
| parent | 53a796afcc0cff6f9e3f51457df4506a43db1945 (diff) | |
| parent | 8a9d743f6f518d3af35014130dcef8f148148113 (diff) | |
| download | volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.gz volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.bz2 volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.zip | |
Merge pull request #9 from redmatrix/master
updating from original codebase
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) { |