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

@@ -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];

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();
 

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)) {