diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-27 21:11:34 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-27 21:11:34 -0400 |
| commit | 1dc795722a8e748ebb98e8fab778cd4686a0654f (patch) | |
| tree | 4f4a4e8dea10090106c4d54a02c6860332cd9df4 /include/photos.php | |
| parent | dcd658f12ea60945678717e3c310e94ece7b1f96 (diff) | |
| parent | c98776923a3aed4a0a17ca1412787de3b718eba9 (diff) | |
| download | volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.gz volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.bz2 volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/photos.php b/include/photos.php index b1391f284..321f7159c 100644 --- a/include/photos.php +++ b/include/photos.php @@ -333,10 +333,17 @@ function photo_upload($channel, $observer, $args) { $lat = $lon = null; - if($exif && $exif['GPS']) { - if(feature_enabled($channel_id,'photo_location')) { - $lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']); - $lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']); + if($exif && feature_enabled($channel_id,'photo_location')) { + $gps = null; + if(array_key_exists('GPS',$exif)) { + $gps = $exif['GPS']; + } + elseif(array_key_exists('GPSLatitude',$exif)) { + $gps = $exif; + } + if($gps) { + $lat = getGps($gps['GPSLatitude'], $gps['GPSLatitudeRef']); + $lon = getGps($gps['GPSLongitude'], $gps['GPSLongitudeRef']); } } |