From 3a204cf9a4f13a5a2748f00a25be6c674d451891 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 24 Aug 2009 08:39:57 +0000
Subject: [PATCH] SimpleSAML_Configuration: No longer require a call to
setConfigDir().
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1707 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Configuration.php | 6 +++++-
www/_include.php | 2 --
www/example-simple/verysimple.php | 4 ----
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index 17fc81d16..3d5f5b406 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -148,7 +148,11 @@ class SimpleSAML_Configuration {
assert('is_string($configSet)');
if (!array_key_exists($configSet, self::$configDirs)) {
- throw new Exception('Configuration set \'' . $configSet . '\' not initialized.');
+ if ($configSet !== 'simplesaml') {
+ throw new Exception('Configuration set \'' . $configSet . '\' not initialized.');
+ } else {
+ self::$configDirs['simplesaml'] = dirname(dirname(dirname(__FILE__))) . '/config';
+ }
}
$dir = self::$configDirs[$configSet];
diff --git a/www/_include.php b/www/_include.php
index f7446668e..810f919d4 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -89,8 +89,6 @@ if (!file_exists($configdir . '/config.php')) {
exit(1);
}
-SimpleSAML_Configuration::setConfigDir($configdir);
-
/* Make sure that the session is initialized before any output. */
SimpleSAML_Session::getInstance();
diff --git a/www/example-simple/verysimple.php b/www/example-simple/verysimple.php
index 44e382edf..1438c2a52 100644
--- a/www/example-simple/verysimple.php
+++ b/www/example-simple/verysimple.php
@@ -14,10 +14,6 @@
*/
require_once('../../lib/_autoload.php');
-/* We need to tell simpleSAMLphp where the configuration is located. */
-SimpleSAML_Configuration::setConfigDir('../../config');
-
-
/* This handles logout requests. */
if (array_key_exists('logout', $_REQUEST)) {
--
GitLab