From ef4e6b9aedb7ffd058220de2d8ab2b44b1447d00 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 13 Aug 2014 08:37:15 -0400
Subject: [PATCH] Cleanup after PR merge, updated changelog

---
 CHANGELOG                             |    1 +
 program/lib/Roundcube/rcube_image.php |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 31c62e5..853f38e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - Fix various iCloud vCard issues, added fallback for external photos (#1489993)
 - Fix invalid Content-Type header when send_format_flowed=false (#1489992)
 - Fix errors when adding/updating contacts in active search (#1490015)
+- Fix incorrect thumbnail rotation with GD and exif orientation data (#1490029)
 
 RELEASE 1.0.2
 -------------
diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php
index 565e9db..122b5f4 100644
--- a/program/lib/Roundcube/rcube_image.php
+++ b/program/lib/Roundcube/rcube_image.php
@@ -206,10 +206,10 @@
                 $image = $new_image;
 
                 // fix rotation of image if EXIF data exists and specifies rotation (GD strips the EXIF data)
-                if ($this->image_file && function_exists(exif_read_data) ) {
+                if ($this->image_file && function_exists('exif_read_data')) {
                     $exif = exif_read_data($this->image_file);
                     if ($exif && $exif['Orientation']) {
-                        switch($exif['Orientation']) {
+                        switch ($exif['Orientation']) {
                             case 3:
                                 $image = imagerotate($image, 180, 0);
                                 break;

--
Gitblit v1.9.1