Don't redraw image again after correcting image orientation; Correct image orientation with convert+gifsicle too

2 files changed, 8 insertions, 6 deletions

diff --git a/inc/image.php b/inc/image.php
index 5910cb85..51db2f83 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -251,9 +251,9 @@ class ImageConvert extends ImageBase {
 		
 		if (!$this->temp) {
 			if ($config['strip_exif']) {
-				shell_exec('convert ' . escapeshellarg($this->src) . ' -strip ' . escapeshellarg($src));
+				shell_exec('convert ' . escapeshellarg($this->src) . ' -auto-orient -strip ' . escapeshellarg($src));
 			} else {
-				shell_exec('convert ' . escapeshellarg($this->src) . ' ' . escapeshellarg($src));
+				shell_exec('convert ' . escapeshellarg($this->src) . ' -auto-orient ' . escapeshellarg($src));
 			}
 		} else {
 			rename($this->temp, $src);
diff --git a/post.php b/post.php
index 22782ca7..5031830f 100644
--- a/post.php
+++ b/post.php
@@ -450,10 +450,12 @@ if (isset($_POST['delete'])) {
 			if ($post['extension'] == 'jpg' || $post['extension'] == 'jpeg') {
 				// The following code corrects the image orientation.
 				// Currently only works with the 'convert' option selected but it could easily be expanded to work with the rest if you can be bothered.
-				if ($config['thumb_method'] == 'convert') {
-					$exif = exif_read_data($upload);
-					if (isset($exif['Orientation']) && $exif['Orientation'] != 1) {
-						shell_exec('convert ' . escapeshellarg($upload) . ' -auto-orient ' . escapeshellarg($upload));							
+				if (!($config['redraw_image'] || ($config['strip_exif'] && ($post['extension'] == 'jpg' || $post['extension'] == 'jpeg')))) {
+					if ($config['thumb_method'] == 'convert' || $config['thumb_method'] == 'convert+gifsicle') {
+						$exif = exif_read_data($upload);
+						if (isset($exif['Orientation']) && $exif['Orientation'] != 1) {
+							shell_exec('convert ' . escapeshellarg($upload) . ' -auto-orient ' . escapeshellarg($upload));							
+						}
 					}
 				}
 			}