From ea7bfa606e56da0f722eebda988fedd31f48d9ea Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Sun, 17 Apr 2016 22:11:08 +0200
Subject: [PATCH] Small corrections in EXIF

---
 php/Modules/Photo.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 52dead3..dbe8204 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -783,7 +783,7 @@ final class Photo {
 		}
 
 		// Read EXIF
-		if ($info['mime']=='image/jpeg') $exif = @exif_read_data($url, 'EXIF', 0);
+		if ($info['mime']=='image/jpeg') $exif = exif_read_data($url, 'EXIF', 0);
 		else $exif = false;
 
 		// EXIF Metadata
@@ -802,15 +802,14 @@ final class Photo {
 
 			if (!empty($exif['ExposureTime'])) $return['shutter'] = $exif['ExposureTime'] . ' s';
 
-			$temp = @$exif['FocalLength'];
-			if (isset($temp)) {
-				if (strpos($temp, '/')!==false) {
-					$temp = explode('/', $temp, 2);
+			if (!empty($exif['FocalLength'])) {
+				if (strpos($exif['FocalLength'], '/')!==false) {
+					$temp = explode('/', $exif['FocalLength'], 2);
 					$temp = $temp[0] / $temp[1];
 					$temp = round($temp, 1);
 					$return['focal'] = $temp . ' mm';
 				}
-				$return['focal'] = $temp . ' mm';
+				$return['focal'] = $exif['FocalLength'] . ' mm';
 			}
 
 			if (!empty($exif['DateTimeOriginal'])) $return['takestamp'] = strtotime($exif['DateTimeOriginal']);