From 14d11103ded698a145b996a5ff31a0aa1705be7f Mon Sep 17 00:00:00 2001
From: Lucas Bartholemy <lucas.bartholemy@humhub.com>
Date: Mon, 20 Feb 2017 17:14:54 +0100
Subject: [PATCH] Fix #2280: Meta data (rotation) not respected for camera
 images (ImageMagick)

---
 protected/humhub/docs/CHANGELOG.md                    | 1 +
 protected/humhub/modules/file/libs/ImageConverter.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index e7c05ca496..fedfa7a6f3 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -43,6 +43,7 @@ HumHub Change Log
 - Enh: Added getContextMenu for defining wallentry context options. 
 - Enh: Added editMode to WallEntry for allowing modal based edits.
 - Fix: file-preview text overflow in HumHub theme.
+- Fix #2280: Meta data (rotation) not respected for camera images (ImageMagick)
 
 1.2.0-beta.1 (February 08, 2017)
 --------------------------------
diff --git a/protected/humhub/modules/file/libs/ImageConverter.php b/protected/humhub/modules/file/libs/ImageConverter.php
index 39bec1b564..f5200c02c0 100644
--- a/protected/humhub/modules/file/libs/ImageConverter.php
+++ b/protected/humhub/modules/file/libs/ImageConverter.php
@@ -36,7 +36,7 @@ class ImageConverter
 
         if (Yii::$app->getModule('file')->settings->get('imageMagickPath')) {
             $convertCommand = Yii::$app->getModule('file')->settings->get('imageMagickPath');
-            $command = $convertCommand . " \"{$sourceFile}\" \"{$targetFile}\"";
+            $command = $convertCommand . " -auto-orient \"{$sourceFile}\" \"{$targetFile}\"";
             $ret = passthru($command);
         } else {
             $gdImage = self::getGDImageByFile($sourceFile);