summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaime Perez Crespo <jaime.perez@uninett.no>2015-08-05 13:42:06 +0200
committerJaime Perez Crespo <jaime.perez@uninett.no>2015-08-05 13:42:06 +0200
commitbed25ed41b0ac00c860ede2d75ce6c36979d54b8 (patch)
treee8c527d3a5da3e83716f5a25f9302cc8feaeb68b
parentee1f63cea5820109b8ed82631f2fb874a07d6d32 (diff)
downloadsimplesamlphp-bed25ed41b0ac00c860ede2d75ce6c36979d54b8.zip
simplesamlphp-bed25ed41b0ac00c860ede2d75ce6c36979d54b8.tar.gz
simplesamlphp-bed25ed41b0ac00c860ede2d75ce6c36979d54b8.tar.bz2
Minor fixes.
-rw-r--r--lib/SimpleSAML/XHTML/IdPDisco.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
index d84fcec..afaf1a7 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);
}