Merge remote-tracking branch 'upstream/master'

1 files changed, 11 insertions, 1 deletions

diff --git a/include/photos.php b/include/photos.php
index 7437d6aa9..cb7fabc98 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -166,7 +166,7 @@ function photo_upload($channel, $observer, $args) {
 		return $ret;
 	}
 
-	$exif = $ph->orient($src);
+	$exif = $ph->orient(($args['os_path']) ? $args['os_path'] : $src);
 
 	@unlink($src);
 
@@ -579,6 +579,16 @@ function getGps($exifCoord, $hemi) {
     return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600)));
 }
 
+function getGpstimestamp($exifCoord) {
+
+    $hours = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0;
+    $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0;
+    $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0;
+
+	return sprintf('%02d:%02d:%02d',$hours,$minutes,$seconds);
+}
+
+
 function gps2Num($coordPart) {
 
     $parts = explode('/', $coordPart);