summaryrefslogtreecommitdiffstats
path: root/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php
diff options
context:
space:
mode:
authorOlav Morken <olav.morken@uninett.no>2009-08-14 11:07:44 +0000
committerOlav Morken <olav.morken@uninett.no>2009-08-14 11:07:44 +0000
commit3aea3623ee640db54a0e5383e25d352d43aa7c5c (patch)
tree1cdb44db77f65250ef43a79e3bd13636c9d7a0ca /lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php
parent3556f998f68bbadba868f0c7bfc03fec956b0a4f (diff)
downloadsimplesamlphp-3aea3623ee640db54a0e5383e25d352d43aa7c5c.zip
simplesamlphp-3aea3623ee640db54a0e5383e25d352d43aa7c5c.tar.gz
simplesamlphp-3aea3623ee640db54a0e5383e25d352d43aa7c5c.tar.bz2
Give default values for all configuration options from config.php
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1665 44740490-163a-0410-bde0-09ae8108e29a
Diffstat (limited to 'lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php')
-rw-r--r--lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php
index 6b6f032..fe352e7 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSAML2Meta.php
@@ -58,7 +58,7 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerSAML2Meta extends SimpleSAML_Met
// The metadata location is an URL
$metadatasetfile = $metadatalocation;
} else {
- $metadatasetfile = $config->getPathValue('metadatadir') . $metadatalocation;
+ $metadatasetfile = $config->getPathValue('metadatadir', 'metadata/') . $metadatalocation;
if (!file_exists($metadatasetfile)) throw new Exception('Could not find SAML 2.0 Metadata file :'. $metadatasetfile);
if (preg_match('@\.php$@', $metadatalocation)) {
$xml = false;