From e223b506cb73cf6135f723d67ac395ea26c5dc8a Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@kunena.org>
Date: Mon, 1 Feb 2016 10:30:53 +0200
Subject: [PATCH] Blueprints: Add alternative syntax for extends@: parent@

---
 system/src/Grav/Common/Data/Blueprints.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/system/src/Grav/Common/Data/Blueprints.php b/system/src/Grav/Common/Data/Blueprints.php
index d7891c940..ce40edd8c 100644
--- a/system/src/Grav/Common/Data/Blueprints.php
+++ b/system/src/Grav/Common/Data/Blueprints.php
@@ -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;