diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-09 01:06:59 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-09 01:06:59 -0700 |
| commit | 7a106cf60cfa005ec6d8c35f922dc57b9af0175e (patch) | |
| tree | 34b0593f9922f33d9e2c2c517ba9f6e9d3490c44 /include/photo/photo_driver.php | |
| parent | 737a3362d50900a5f26aada14f515c5c857a762f (diff) | |
| parent | fc0576acf810019a0c168bfa4dc4a2175ae0b505 (diff) | |
| download | volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.tar.gz volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.tar.bz2 volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/photo/photo_driver.php')
| -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 0853ce84e..9cd05e26e 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -516,7 +516,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) { |