Skip to content
Snippets Groups Projects
Commit 3a204cf9 authored by Olav Morken's avatar Olav Morken
Browse files

SimpleSAML_Configuration: No longer require a call to setConfigDir().

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1707 44740490-163a-0410-bde0-09ae8108e29a
parent ea46bdec
No related branches found
No related tags found
No related merge requests found
......@@ -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];
......
......@@ -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();
......
......@@ -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)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment