From 16dd2ef9d03ec81d3d26a25f964b2d4fc1cd48e6 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 20 Jul 2020 22:47:33 -0600
Subject: [PATCH] moved fixOrientation() into ImageMediaTrait

Signed-off-by: Andy Miller <rhuk@mac.com>
---
 .../Grav/Common/Media/Traits/ImageMediaTrait.php    |  6 ++++++
 system/src/Grav/Common/Page/Medium/ImageMedium.php  | 13 -------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php b/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
index bc47c7794..382fa90bc 100644
--- a/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
+++ b/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
@@ -342,6 +342,12 @@ trait ImageMediaTrait
             ->setActualCacheDir($cacheDir)
             ->setPrettyName($this->getImagePrettyName());
 
+        // Fix orientation if enabled
+        if (Grav::instance()['config']->get('system.images.auto_fix_orientation', false)) {
+            $this->image->fixOrientation();
+        }
+
+
         return $this;
     }
 
diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index 177e8b290..a1da2b100 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -24,8 +24,6 @@ class ImageMedium extends Medium implements ImageMediaInterface, ImageManipulate
     use ImageMediaTrait;
     use ImageLoadingTrait;
 
-    protected static $orientationFixed;
-
     /**
      * Construct.
      *
@@ -91,7 +89,6 @@ class ImageMedium extends Medium implements ImageMediaInterface, ImageManipulate
             $this->medium_querystring = [];
             $this->filter();
             $this->clearAlternatives();
-            static::$orientationFixed = null;
         }
 
         $this->format = 'guess';
@@ -279,16 +276,6 @@ class ImageMedium extends Medium implements ImageMediaInterface, ImageManipulate
             $this->image();
         }
 
-        // Fix orientation if enabled
-        if (!isset(static::$orientationFixed)) {
-            if (Grav::instance()['config']->get('system.images.auto_fix_orientation', false)) {
-                $this->image->fixOrientation();
-                static::$orientationFixed = true;
-            } else {
-                static::$orientationFixed = false;
-            }
-        }
-
         try {
             $this->image->{$method}(...$args);