From bed25ed41b0ac00c860ede2d75ce6c36979d54b8 Mon Sep 17 00:00:00 2001 From: Jaime Perez Crespo <jaime.perez@uninett.no> Date: Wed, 5 Aug 2015 13:42:06 +0200 Subject: [PATCH] Minor fixes. --- lib/SimpleSAML/XHTML/IdPDisco.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php index d84fcec45..afaf1a750 100644 --- a/lib/SimpleSAML/XHTML/IdPDisco.php +++ b/lib/SimpleSAML/XHTML/IdPDisco.php @@ -157,8 +157,6 @@ class SimpleSAML_XHTML_IdPDisco if (array_key_exists('IdPentityID', $_GET)) { $this->setIdPentityID = $_GET['IdPentityID']; - } else { - $this->setIdPentityID = null; } if (array_key_exists('IDPList', $_REQUEST)) { @@ -252,6 +250,7 @@ class SimpleSAML_XHTML_IdPDisco $this->metadata->getMetaData($idp, $metadataSet); return $idp; } catch (Exception $e) { + // continue } } @@ -274,7 +273,7 @@ class SimpleSAML_XHTML_IdPDisco /* Parameter set from the Extended IdP Metadata Discovery Service Protocol, indicating that the user prefers * this IdP. */ - if ($this->setIdPentityID) { + if (!empty($this->setIdPentityID)) { return $this->validateIdP($this->setIdPentityID); } -- GitLab