diff options
Diffstat (limited to 'Zotlabs/Photo/PhotoDriver.php')
-rw-r--r-- | Zotlabs/Photo/PhotoDriver.php | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Zotlabs/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php index 6bdb89ab1..f50ef17ae 100644 --- a/Zotlabs/Photo/PhotoDriver.php +++ b/Zotlabs/Photo/PhotoDriver.php @@ -344,19 +344,13 @@ abstract class PhotoDriver { return false; } - /* - * PHP 7.2 allows you to use a stream resource, which should reduce/avoid - * memory exhaustion on large images. - */ - - if(version_compare(PHP_VERSION, '7.2.0') >= 0) { - $f = @fopen($filename, 'rb'); - } else { - $f = $filename; - } + $f = @fopen($filename, 'rb'); if($f) { - return @exif_read_data($f, null, true); + // exif_read_data accepts a stream resource in php > 7.2 + $x = @exif_read_data($f, null, true); + fclose($f); + return $x; } return false; |