From 2fc39c8abd96b9a174000e919f3a5baf00c4a2ca Mon Sep 17 00:00:00 2001
From: Steffen Vogel <info@steffenvogel.de>
Date: Mon, 1 Nov 2010 11:59:36 +0100
Subject: [PATCH] added support to change the configuration

---
 backend/lib/Util/Configuration.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/lib/Util/Configuration.php b/backend/lib/Util/Configuration.php
index 7ba0935..b924a9e 100644
--- a/backend/lib/Util/Configuration.php
+++ b/backend/lib/Util/Configuration.php
@@ -45,10 +45,10 @@ class Configuration {
 		$values =& self::$values;
 		$tree = explode('.', $var);
 		foreach ($tree as $part) {
-			$values =& $values[$part];	// TODO use array_merge_recursive()
+			$values =& $values[$part];
 		}
 
-		$values = $value;
+		$values = array_merge_recursive($values, $value);
 	}
 
 	/**
@@ -144,4 +144,4 @@ EOT;
 	}
 }
 
-?>
\ No newline at end of file
+?>