Skip to content

Commit 5163f53

Browse files
committed
using array_replace_recursive() instead of array_merge()
1 parent 3672d9e commit 5163f53

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/PatternLab/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public static function getPatternSpecificData($patternPartial,$extraData = array
305305
if (isset($d["patternSpecific"]) && array_key_exists($patternPartial,$d["patternSpecific"])) {
306306

307307
if (!empty($d["patternSpecific"][$patternPartial]["data"])) {
308-
$d = array_merge($d, $d["patternSpecific"][$patternPartial]["data"]);
308+
$d = array_replace_recursive($d, $d["patternSpecific"][$patternPartial]["data"]);
309309
}
310310

311311
if (!empty($d["patternSpecific"][$patternPartial]["listItems"])) {
@@ -317,7 +317,7 @@ public static function getPatternSpecificData($patternPartial,$extraData = array
317317

318318
while ($k < $c) {
319319
$section = $numbers[$k];
320-
$d["listItems"][$section] = array_merge( $d["listItems"][$section], $d["patternSpecific"][$patternPartial]["listItems"][$section]);
320+
$d["listItems"][$section] = array_replace_recursive( $d["listItems"][$section], $d["patternSpecific"][$patternPartial]["listItems"][$section]);
321321
$k++;
322322
}
323323

0 commit comments

Comments
 (0)