From 9a8efdf9cdd9b6493a0904bfbf11c8f587ee8294 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 21 Dec 2015 19:10:19 +0100
Subject: [PATCH] Fix for images orientation in page content

---
 system/src/Grav/Common/Markdown/ParsedownGravTrait.php | 5 +++++
 system/src/Grav/Common/Page/Medium/ImageMedium.php     | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index 5ae25165a..3614f770c 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -278,6 +278,8 @@ trait ParsedownGravTrait
                     return $carry;
                 }, []);
 
+                $actions['fixOrientation'] = true;
+
                 // valid attributes supported
                 $valid_attributes = ['rel', 'target', 'id', 'class', 'classes'];
 
@@ -301,6 +303,9 @@ trait ParsedownGravTrait
                 }
 
 
+                $url['query']= http_build_query($actions, null, '&', PHP_QUERY_RFC3986);
+            } else {
+                $actions['fixOrientation'] = true;
                 $url['query']= http_build_query($actions, null, '&', PHP_QUERY_RFC3986);
             }
 
diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index 6da85af45..cc9e77717 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -41,8 +41,7 @@ class ImageMedium extends Medium
     public static $magic_actions = [
         'resize', 'forceResize', 'cropResize', 'crop', 'zoomCrop',
         'negate', 'brightness', 'contrast', 'grayscale', 'emboss',
-        'smooth', 'sharp', 'edge', 'colorize', 'sepia', 'enableProgressive',
-        'fixOrientation'
+        'smooth', 'sharp', 'edge', 'colorize', 'sepia', 'enableProgressive', 'fixOrientation'
     ];
 
     /**
@@ -261,7 +260,6 @@ class ImageMedium extends Medium
         if ($this->image) {
             $this->image();
             $this->image->clearOperations(); // Clear previously applied operations
-            $this->fixOrientation();
             $this->filter();
         }
 
@@ -471,7 +469,6 @@ class ImageMedium extends Medium
             ->setPrettyName(basename($this->get('basename')));
 
         $this->filter();
-        $this->fixOrientation();
 
         return $this;
     }