diff options
| author | RedMatrix <info@friendica.com> | 2014-10-08 18:14:27 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2014-10-08 18:14:27 +1100 |
| commit | b52d575e956c2530b103f772eaa6cc9df53d7d6c (patch) | |
| tree | 9f39b4392181d10e7ffae85d0c3b2ff8d1908a00 | |
| parent | e5d346cdc63e5f36ac25fe43a198657549643eb4 (diff) | |
| parent | 9d5129de34b0c7877cbb4b84551e75c0aa95117a (diff) | |
| download | volse-hubzilla-b52d575e956c2530b103f772eaa6cc9df53d7d6c.tar.gz volse-hubzilla-b52d575e956c2530b103f772eaa6cc9df53d7d6c.tar.bz2 volse-hubzilla-b52d575e956c2530b103f772eaa6cc9df53d7d6c.zip | |
Merge pull request #625 from letterbomber/master
put back local file check so body is fetched from z_ functions
| -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) { |