Browse Source

Merge pull request #520 from qligier/pr-exif2

Fix for EXIF read errors
Tobias Reich 8 years ago
parent
commit
a8a7b15198
1 changed files with 2 additions and 2 deletions
  1. 2 2
      php/Modules/Photo.php

+ 2 - 2
php/Modules/Photo.php

@@ -741,7 +741,7 @@ final class Photo {
 		$return['focal']       = '';
 		$return['takestamp']   = 0;
 		$return['lens']        = '';
-		$return['tags']        = array();
+		$return['tags']        = '';
 		$return['position']    = '';
 		$return['latitude']    = '';
 		$return['longitude']   = '';
@@ -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', false, false);
 		else $exif = false;
 
 		// EXIF Metadata