Skip to content
Snippets Groups Projects
Commit cc1b9026 authored by Pavel Břoušek's avatar Pavel Břoušek
Browse files

chore: merge branch 'fix_merge_map_attrs' into 'main'

fix: use the correct order in merging map attributes

See merge request perun-proxy-aai/simplesamlphp/simplesamlphp-module-perun!315
parents ff4e91c2 153ff60e
No related branches found
No related tags found
1 merge request!315fix: use the correct order in merging map attributes
Pipeline #325895 passed with warnings
......@@ -168,7 +168,7 @@ class UESUpdateHelper
strpos($attribute[self::TYPE], self::MAP_TYPE) ||
!in_array($attrName, $serializedAttributes, true)
) {
$attr = array_merge($attr, $attribute[self::VALUE]);
$attr = array_merge($attribute[self::VALUE], $attr);
} else {
$attr = array_merge($attr, explode(';', $attribute[self::VALUE]));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment