Commit 1d656f8 1 parent 79f6252 commit 1d656f8 Copy full SHA for 1d656f8
File tree 1 file changed +5
-1
lines changed
1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -5004,15 +5004,19 @@ protected function libMapMerge($args)
5004
5004
$ map2 = $ this ->assertMap ($ args [1 ]);
5005
5005
5006
5006
foreach ($ map2 [1 ] as $ i2 => $ key2 ) {
5007
+ $ key = $ this ->compileStringContent ($ this ->coerceString ($ key2 ));
5008
+
5007
5009
foreach ($ map1 [1 ] as $ i1 => $ key1 ) {
5008
- if ($ this -> compileStringContent ( $ this -> coerceString ( $ key1 )) === $ this ->compileStringContent ($ this ->coerceString ($ key2 ))) {
5010
+ if ($ key === $ this ->compileStringContent ($ this ->coerceString ($ key1 ))) {
5009
5011
$ map1 [2 ][$ i1 ] = $ map2 [2 ][$ i2 ];
5010
5012
continue 2 ;
5011
5013
}
5012
5014
}
5015
+
5013
5016
$ map1 [1 ][] = $ map2 [1 ][$ i2 ];
5014
5017
$ map1 [2 ][] = $ map2 [2 ][$ i2 ];
5015
5018
}
5019
+
5016
5020
return $ map1 ;
5017
5021
}
5018
5022
You can’t perform that action at this time.
0 commit comments