Upgrade to rc5

2020-12-10 11:24:42 +01:00
parent 3fec0d7c93
commit c378376bc9
257 changed files with 13009 additions and 1846 deletions
--- a/kirby/src/Cms/Blueprint.php
+++ b/kirby/src/Cms/Blueprint.php
@@ -201,6 +201,7 @@ class Blueprint

        try {
            $mixin = static::find($extends);
+            $mixin = static::extend($mixin);
            $props = A::merge($mixin, $props, A::MERGE_REPLACE);
        } catch (Exception $e) {
            // keep the props unextended if the snippet wasn't found