From eb1f8990e0493ba7f791a53ff6c50835c609cc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Mon, 14 Apr 2008 13:27:13 +0000
Subject: [PATCH] Adding support for getting a new config file from the same
directory as the current one. Used in example in the login modules that hae
their own cofig file in addition to config.php.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@492 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Configuration.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index eddd30331..3564d93a9 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -3,7 +3,7 @@
/**
* Configuration of SimpleSAMLphp
*
- * @author Andreas Ĺkre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
+ * @author Andreas Aakre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
* @package simpleSAMLphp
* @version $Id$
*/
@@ -30,6 +30,11 @@ class SimpleSAML_Configuration {
public static function init($path, $instancename = 'simplesaml', $configfilename = 'config.php') {
self::$instance[$instancename] = new SimpleSAML_Configuration($path, $configfilename);
}
+
+ public function copyFromBase($instancename, $filename) {
+ self::$instance[$instancename] = new SimpleSAML_Configuration($this->configpath, $filename);
+ return self::$instance[$instancename];
+ }
private function loadConfig() {
$filename = $this->configpath . '/' . $this->configfilename;
--
GitLab