diff options
| author | marijus <mario@mariovavti.com> | 2014-10-08 09:49:21 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-10-08 09:49:21 +0200 |
| commit | 38e37d8d689329c8ca13580aa94fb525c1f845be (patch) | |
| tree | 861db3650ad0eca1eaf2809822868c4f64d597ce /include | |
| parent | e05c0a8bc45bd6051d61b0c93699c666825feba9 (diff) | |
| parent | b52d575e956c2530b103f772eaa6cc9df53d7d6c (diff) | |
| download | volse-hubzilla-38e37d8d689329c8ca13580aa94fb525c1f845be.tar.gz volse-hubzilla-38e37d8d689329c8ca13580aa94fb525c1f845be.tar.bz2 volse-hubzilla-38e37d8d689329c8ca13580aa94fb525c1f845be.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include')
| -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) { |