From bf5e742a7f2b2b7d02bc0c15814d689022a8db31 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 15 Jun 2018 09:51:42 +0300 Subject: [PATCH 1/3] Revert Medium object cloning for now (has unexpected side effects) [#2045] --- system/src/Grav/Common/Page/Medium/AbstractMedia.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Page/Medium/AbstractMedia.php b/system/src/Grav/Common/Page/Medium/AbstractMedia.php index 47dcfee69..4c95938c3 100644 --- a/system/src/Grav/Common/Page/Medium/AbstractMedia.php +++ b/system/src/Grav/Common/Page/Medium/AbstractMedia.php @@ -52,7 +52,9 @@ abstract class AbstractMedia extends Getters public function offsetGet($offset) { $object = parent::offsetGet($offset); - $object = $object ? clone($object) : null; + + // It would be nice if previous image modification would not affect the later ones. + //$object = $object ? clone($object) : null; return $object; } From aea26f4db93fc1fec5be8804f47c225721e57026 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 19 Jun 2018 18:38:48 +0100 Subject: [PATCH 2/3] Updated changelog --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b38a6511d..93342d1dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,18 @@ # v1.4.6 -## mm/dd/2018 +## 06/19/2018 1. [](#improved) * Manually re-added the improved SSL off-loading that was lost with Grav v1.4.0 merge [#1888](https://github.com/getgrav/grav/pull/1888) + * Handle multibyte strings in `truncateLetters()` [#2007](https://github.com/getgrav/grav/pull/2007) * Updated robots.txt to include `/user/images/` folder [#2043](https://github.com/getgrav/grav/pull/2043) + * Add getter methods for original and action to the Page object [#2005](https://github.com/getgrav/grav/pull/2005) + * Modular template extension follows the master page extension [#2044](https://github.com/getgrav/grav/pull/2044) + * Vendor library updates 1. [](#bugfix) * Handle `errors.display` system property better in admin plugin [admin#1452](https://github.com/getgrav/grav-plugin-admin/issues/1452) * Fix classes on non-http based protocol links [#2034](https://github.com/getgrav/grav/issues/2034) * Fixed crash on IIS (Windows) with open_basedir in effect [#2053](https://github.com/getgrav/grav/issues/2053) * Fixed incorrect routing with setup.php based base [#1892](https://github.com/getgrav/grav/issues/1892) - * Fixed image resource memory deallocation [#2045](https://github.com/getgrav/grav/pull/2045) # v1.4.5 ## 05/15/2018 From 290e5be53483977a52da4932ce3fc2fb59675fbe Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 19 Jun 2018 18:42:40 +0100 Subject: [PATCH 3/3] Prepare for release --- system/defines.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/defines.php b/system/defines.php index 5d02c474c..28c4434f0 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.4.5'); +define('GRAV_VERSION', '1.4.6'); define('GRAV_TESTING', false); define('DS', '/');