diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-09 01:09:41 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-09 01:09:41 -0700 |
| commit | 1b0b847fc80827022c513a74a7fa817c7d640da0 (patch) | |
| tree | 09a09da19a7eee4c5dc1100b89757e85d2bc8ab8 /include/photo | |
| parent | ddf4ef752077e66d34edb458cfe104ee23ef3834 (diff) | |
| parent | fc0576acf810019a0c168bfa4dc4a2175ae0b505 (diff) | |
| download | volse-hubzilla-1b0b847fc80827022c513a74a7fa817c7d640da0.tar.gz volse-hubzilla-1b0b847fc80827022c513a74a7fa817c7d640da0.tar.bz2 volse-hubzilla-1b0b847fc80827022c513a74a7fa817c7d640da0.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/photo')
| -rw-r--r-- | include/photo/photo_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index c416c0df3..508d82957 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -515,7 +515,7 @@ function guess_image_type($filename, $headers = '') { $ignore_imagick = get_config('system', 'ignore_imagick'); // Guessing from extension? Isn't that... dangerous? - if(class_exists('Imagick') && !$ignore_imagick) { + if(class_exists('Imagick') && file_exists($filename) && is_readable($filename) && !$ignore_imagick) { $v = Imagick::getVersion(); preg_match('/ImageMagick ([0-9]+\.[0-9]+\.[0-9]+)/', $v['versionString'], $m); if(version_compare($m[1],'6.6.7') >= 0) { |