interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RC6

Browse Source
This commit is contained in:
Bastian Allgeier
2019-01-14 10:52:45 +01:00
parent 01277f79f2
commit 8070893b64
22 changed files with 482 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kirby/src/Cms/Blueprint.php
View File

@@ -7,6 +7,7 @@ use Kirby\Exception\InvalidArgumentException;
use Kirby\Exception\NotFoundException;
use Kirby\Data\Data;
use Kirby\Form\Field;
use Kirby\Toolkit\A;
use Kirby\Toolkit\F;
use Kirby\Toolkit\I18n;
use Kirby\Toolkit\Obj;
@@ -197,10 +198,10 @@ class Blueprint
if ($mixin === null) {
$props = $props;
} elseif (is_array($mixin) === true) {
$props = array_replace_recursive($mixin, $props);
$props = A::merge($mixin, $props, A::MERGE_REPLACE);
} else {
try {
$props = array_replace_recursive(Data::read($mixin), $props);
$props = A::merge(Data::read($mixin), $props, A::MERGE_REPLACE);
} catch (Exception $e) {
$props = $props;
}