summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaime Pérez Crespo <jaime.perez@uninett.no>2015-06-03 19:04:14 +0200
committerJaime Pérez Crespo <jaime.perez@uninett.no>2015-06-03 19:04:14 +0200
commit37f4425a9b97e17d659ace44050c2181e9a6ceef (patch)
treeebd79aeef5909ba7fa99e830dcf0047fa45fad41
parent6c841e30c66d3b2b33a82d764a137d033bbf3530 (diff)
parent19797bae1cabd9ac7bcd11bddf3bdc8d3b7c6d41 (diff)
downloadsimplesamlphp-37f4425a9b97e17d659ace44050c2181e9a6ceef.zip
simplesamlphp-37f4425a9b97e17d659ace44050c2181e9a6ceef.tar.gz
simplesamlphp-37f4425a9b97e17d659ace44050c2181e9a6ceef.tar.bz2
Merge pull request #215 from enricocavalli/patch-1
Corrected logic in checkSessionCookie
-rw-r--r--lib/SimpleSAML/Utils/HTTP.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/SimpleSAML/Utils/HTTP.php b/lib/SimpleSAML/Utils/HTTP.php
index 7518bfa..8b0caf3 100644
--- a/lib/SimpleSAML/Utils/HTTP.php
+++ b/lib/SimpleSAML/Utils/HTTP.php
@@ -271,7 +271,7 @@ class HTTP
*/
public static function checkSessionCookie($retryURL = null)
{
- if (!is_string($retryURL) || !is_null($retryURL)) {
+ if (!is_string($retryURL) && !is_null($retryURL)) {
throw new \InvalidArgumentException('Invalid input parameters.');
}
@@ -1024,4 +1024,4 @@ class HTTP
$p->show();
exit(0);
}
-} \ No newline at end of file
+}