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

Blueprints: Add alternative syntax for extends@: parent@

Browse Source
This commit is contained in:
Matias Griese
2016-02-01 10:30:53 +02:00
parent 8bc4d1e460
commit e223b506cb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/src/Grav/Common/Data/Blueprints.php
View File

@@ -62,10 +62,11 @@ class Blueprints
$blueprint = new Blueprint($type, $blueprints, $this);
if (isset($blueprints['@extends'])) {
// Extend blueprint by other blueprints.
$extends = (array) $blueprints['@extends'];
$extends = isset($blueprints['@extends']) ? (array) $blueprints['@extends']
: (isset($blueprints['extends@']) ? (array) $blueprints['extends@'] : null);
if (isset($extends)) {
// Extend blueprint by other blueprints.
if (is_string(key($extends))) {
$extends = [ $extends ];
}
@@ -75,7 +76,7 @@ class Blueprints
if (!$extendType) {
continue;
} elseif ($extendType === '@parent') {
} elseif ($extendType === '@parent' || $extendType === 'parent@') {
$parentFile = array_shift($parents);
if (!$parentFile || !is_file($parentFile)) {
continue;