diff options
| author | Mario <mario@mariovavti.com> | 2024-03-22 08:37:29 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-03-22 08:37:29 +0000 |
| commit | 1aeb05628b6a2a069c46980efbe628362c9e3e74 (patch) | |
| tree | e9aed15d0cd74e0c23dcb05c7be8fe9541efdf36 /include/photo/photo_driver.php | |
| parent | 5b7387459cf4de8f7354d81cb0392c4225714d94 (diff) | |
| parent | b464fae3bf22585888c5f3def8eded76fd48ed16 (diff) | |
| download | volse-hubzilla-1aeb05628b6a2a069c46980efbe628362c9e3e74.tar.gz volse-hubzilla-1aeb05628b6a2a069c46980efbe628362c9e3e74.tar.bz2 volse-hubzilla-1aeb05628b6a2a069c46980efbe628362c9e3e74.zip | |
Merge branch '9.0RC'9.0
Diffstat (limited to 'include/photo/photo_driver.php')
| -rw-r--r-- | include/photo/photo_driver.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 522e638de..4394d3238 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -117,7 +117,14 @@ function guess_image_type($filename, $data = '') { $body = $data['body']; if ($body) { $image = new Imagick(); - $image->readImageBlob($body); + + try{ + $image->readImageBlob($body); + } catch (\Exception $e) { + logger('Imagick readImageBlob() exception:' . print_r($e, true)); + return $type; + } + $r = $image->identifyImage(); if ($r && is_array($r) && array_key_exists($r['mimetype'], $types)) $type = $r['mimetype']; |