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

Fixed infinite loop in blueprints with extend@ to a parent stream

Browse Source
This commit is contained in:
Matias Griese
2020-09-08 23:15:36 +03:00
parent f2c271f66d
commit 582352b2d2
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,6 +3,7 @@
1. [](#bugfix)
* Fixed `Security::sanitizeSVG()` creating an empty file if SVG file cannot be parsed
* Fixed infinite loop in blueprints with `extend@` to a parent stream
# v1.7.0-rc.16
## 09/01/2020

6
system/src/Grav/Common/Data/Blueprint.php
View File

@@ -349,7 +349,11 @@ class Blueprint extends BlueprintForm
if (\is_string($path) && !$locator->isStream($path)) {
// Find path overrides.
$paths = (array) ($this->overrides[$path] ?? null);
if (null === $context) {
$paths = (array) ($this->overrides[$path] ?? null);
} else {
$paths = [];
}
// Add path pointing to default context.
if ($context === null) {