Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-08-05 17:20:10 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'feature/exif-auto-fix-orientation' into develop

Browse Source
This commit is contained in:
Andy Miller
2015-12-21 21:13:09 -07:00
parent 729f83b3d4 b2c7e22634
commit 45d415e547
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/src/Grav/Common/Markdown/ParsedownGravTrait.php
View File

@@ -267,7 +267,8 @@ trait ParsedownGravTrait
// if this is a link
if (isset($excerpt['element']['attributes']['href'])) {
$url = parse_url(htmlspecialchars_decode($excerpt['element']['attributes']['href']));
$actions = [];
// if there is a query, then parse it and build action calls
if (isset($url['query'])) {
$actions = array_reduce(explode('&', $url['query']), function ($carry, $item) {
@@ -299,11 +300,11 @@ trait ParsedownGravTrait
}
}
}
$url['query']= http_build_query($actions, null, '&', PHP_QUERY_RFC3986);
}
$actions['fixOrientation'] = true;
$url['query']= http_build_query($actions, null, '&', PHP_QUERY_RFC3986);
// if no query elements left, unset query
if (empty($url['query'])) {
unset ($url['query']);

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

@@ -41,7 +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'
'smooth', 'sharp', 'edge', 'colorize', 'sepia', 'enableProgressive', 'fixOrientation'
];
/**