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

Fix orientation when auto_fix_orientation option is enabled

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2020-07-20 19:08:45 -06:00
parent a66c282ee5
commit bef4f6a0db
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/src/Grav/Common/Page/Markdown/Excerpts.php
View File

@@ -266,11 +266,6 @@ class Excerpts
);
}
$config = $this->getConfig();
if (!empty($config['images']['auto_fix_orientation'])) {
$actions[] = ['method' => 'fixOrientation', 'params' => ''];
}
$defaults = $config['images']['defaults'] ?? [];
if (count($defaults)) {
foreach ($defaults as $method => $params) {

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

@@ -24,6 +24,8 @@ class ImageMedium extends Medium implements ImageMediaInterface, ImageManipulate
use ImageMediaTrait;
use ImageLoadingTrait;
protected static $orientationFixed;
/**
* Construct.
*
@@ -89,6 +91,7 @@ class ImageMedium extends Medium implements ImageMediaInterface, ImageManipulate
$this->medium_querystring = [];
$this->filter();
$this->clearAlternatives();
static::$orientationFixed = null;
}
$this->format = 'guess';
@@ -276,6 +279,16 @@ 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);