Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-06 04:39:09 +02:00
Code Issues Packages Projects Releases Activity

moved fixOrientation() into ImageMediaTrait

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2020-07-20 22:47:33 -06:00
parent aaff2f486f
commit 16dd2ef9d0
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
View File

@@ -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;
}

13
system/src/Grav/Common/Page/Medium/ImageMedium.php
View File

@@ -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);