Commit 1615f017 authored by haemmer's avatar haemmer

Various small changes

parent b0bc1904
......@@ -45,7 +45,7 @@ SWITCHwayf Version History
- Added new version of JQuery library
- Some small styling changes/CSS improvements
Issues: <https://forge.switch.ch/redmine/projects/wayf/versions/???>
Issues: <https://forge.switch.ch/redmine/projects/wayf/versions/56>
Please read the specific update instructions in the README file.
* Version 1.18 - Release date: 5. August 2013
......
......@@ -487,7 +487,7 @@ function mergeInfo($IDProviders, $metadataIDProviders, $SAML2MetaOverLocalConf,
$allIDPS = $metadataIDProviders;
$mergedArray = Array();
if ($includeLocalConfEntries) {
$allIDPS = array_merge($metadataIDProviders, $IDProviders);
$allIDPS = array_merge($metadataIDProviders, $IDProviders);
}
foreach ($allIDPS as $allIDPsKey => $allIDPsEntry){
......@@ -509,10 +509,10 @@ function mergeInfo($IDProviders, $metadataIDProviders, $SAML2MetaOverLocalConf,
// Local conf overwrites metada entry
$mergedArray[$allIDPsKey] = array_merge($metadataIDProviders[$allIDPsKey], $IDProviders[$allIDPsKey]);
}
} else {
} else {
// Entry only exists in local IDProviders file
$mergedArray[$allIDPsKey] = $IDProviders[$allIDPsKey];
}
}
} else {
// Entry doesnt exist in in local IDProviders.conf.php
$mergedArray[$allIDPsKey] = $metadataIDProviders[$allIDPsKey];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment