Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/getgrav/grav into 1.5
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	system/defines.php
  • Loading branch information
mahagr committed Jun 20, 2018
2 parents 794db2e + 4eb9866 commit 7aa688e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion system/src/Grav/Common/Page/Medium/AbstractMedia.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ public function __invoke($filename)
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;
}
Expand Down

0 comments on commit 7aa688e

Please sign in to comment.