Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

2013-08-04 23:31:53 -04:00
parent c669b087fa f1e3c53d8d
commit 06d2dafa2a
2 changed files with 3 additions and 3 deletions
--- a/inc/image.php
+++ b/inc/image.php
@@ -371,7 +371,7 @@ class ImageConvert extends ImageBase {
 	// For when -auto-orient doesn't exist (older versions)
 	static public function jpeg_exif_orientation($src, $exif = false) {
 		if (!$exif) {
-			$exif = exif_read_data($src);
+			$exif = @exif_read_data($src);
 			if (!isset($exif['Orientation']))
 				return false;
 		}