summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-08-04 23:31:53 -0400
committerczaks <marcin@6irc.net>2013-08-04 23:31:53 -0400
commit06d2dafa2a8eac89acc81103bfb48196d1ba7ba3 (patch)
treee1e2150960239a1f4a2fcdd39b166df7f67adf62 /inc
parentc669b087fab8299b7c8b3c1abe4643f4910d56d9 (diff)
parentf1e3c53d8d504cfd2ad34b948462f0486c02cc65 (diff)
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Diffstat (limited to 'inc')
-rw-r--r--inc/image.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/image.php b/inc/image.php
index 920cf8f9..9c4bbef4 100644
--- 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;
}