From 34cc8fb30aac0be4518398a01e253987d6d6daef Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Wed, 5 Aug 2015 16:40:14 +0200
Subject: [PATCH] Refactor SimpleSAML_XHTML_IdPDisco::filter() to filterList(),
and extend in sspmod_discopower_PowerIdPDisco.
---
lib/SimpleSAML/XHTML/IdPDisco.php | 4 ++--
modules/discopower/lib/PowerIdPDisco.php | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
index afaf1a750..f01e7f4d8 100644
--- a/lib/SimpleSAML/XHTML/IdPDisco.php
+++ b/lib/SimpleSAML/XHTML/IdPDisco.php
@@ -493,7 +493,7 @@ class SimpleSAML_XHTML_IdPDisco
*
* @return array An associative array containing metadata for the IdPs that were not filtered out.
*/
- protected function filter($list)
+ protected function filterList($list)
{
foreach ($list as $entity => $metadata) {
if (array_key_exists('hide.from.discovery', $metadata) && $metadata['hide.from.discovery'] === true) {
@@ -542,7 +542,7 @@ class SimpleSAML_XHTML_IdPDisco
// no choice made. Show discovery service page
$idpList = $this->getIdPList();
- $idpList = $this->filter($idpList);
+ $idpList = $this->filterList($idpList);
$preferredIdP = $this->getRecommendedIdP();
$idpintersection = array_intersect(array_keys($idpList), $this->getScopedIDPList());
diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index 44f481352..26c4efd49 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -144,6 +144,7 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco {
}
protected function filterList($list) {
+ parent::filterList($list);
try {
$spmd = $this->metadata->getMetaData($this->spEntityId, 'saml20-sp-remote');
--
GitLab