Commit ed25c0d2 authored by haemmer's avatar haemmer
Browse files

Added a check to prevent problems with 'ghost' IdPs in IDProvider.conf.php

parent d7a065fa
...@@ -590,7 +590,7 @@ function sortIdentityProviders(&$IDProviders){ ...@@ -590,7 +590,7 @@ function sortIdentityProviders(&$IDProviders){
$sortedCategories = Array(); $sortedCategories = Array();
foreach ($IDProviders as $entityId => $IDProvider){ foreach ($IDProviders as $entityId => $IDProvider){
if (!is_array($IDProvider)){ if (!is_array($IDProvider) || !isset($IDProvider['Name'])){
// Remove any entries that are not arrays // Remove any entries that are not arrays
unset($IDProviders[$entityId]); unset($IDProviders[$entityId]);
} elseif ($IDProvider['Type'] == 'category'){ } elseif ($IDProvider['Type'] == 'category'){
...@@ -601,7 +601,6 @@ function sortIdentityProviders(&$IDProviders){ ...@@ -601,7 +601,6 @@ function sortIdentityProviders(&$IDProviders){
} }
// Sort categories and IdPs // Sort categories and IdPs
if (count($sortedCategories) > 1){ if (count($sortedCategories) > 1){
// Sort using index // Sort using index
uasort($sortedCategories, 'sortUsingTypeIndexAndName'); uasort($sortedCategories, 'sortUsingTypeIndexAndName');
......
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