From d9f9eb97e35c60f161abfb83a01f7dac0b95a0cf Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 21 Mar 2012 12:28:14 +0000
Subject: [PATCH] Configuration: Fix getPathValue() with $default=NULL
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3051 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Configuration.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index e92a585e3..f4640bd1f 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -430,6 +430,10 @@ class SimpleSAML_Configuration {
$path = $this->configuration[$name];
}
+ if ($path === NULL) {
+ return NULL;
+ }
+
return $this->resolvePath($path) . '/';
}
--
GitLab