mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-09-01 09:52:59 +02:00
Code Issues Releases Wiki Activity

Fixed exif data from non image path (close #343, close #745, close #764)

Browse Source
This commit is contained in:
Edgard Lorraine Messias
2020-11-11 11:01:28 -03:00
committed by GitHub
parent 032263954c
commit 3ab514c804
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Intervention/Image/Commands/ExifCommand.php
View File

@@ -28,7 +28,17 @@ class ExifCommand extends AbstractCommand
// try to read exif data from image file
try {
$data = @exif_read_data($image->dirname . '/' . $image->basename);
if ($image->dirname && $image->basename) {
$stream = $image->dirname . '/' . $image->basename;
} elseif (version_compare(PHP_VERSION, '7.2.0', '>=')) {
// https://www.php.net/manual/en/function.exif-read-data.php#refsect1-function.exif-read-data-changelog
$stream = $image->stream()->detach();
} else {
// https://bugs.php.net/bug.php?id=65187
$stream = $image->encode('data-url')->encoded;
}
$data = @exif_read_data($stream);
if (!is_null($key) && is_array($data)) {
$data = array_key_exists($key, $data) ? $data[$key] : false;