From 95b032891d6617525636cc7b680117dbb14afba7 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 19 Jan 2011 14:56:01 +0000
Subject: Merge last changes on "Data" from trunk

---
 framework/Data/TDataSourceConfig.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'framework/Data/TDataSourceConfig.php')

diff --git a/framework/Data/TDataSourceConfig.php b/framework/Data/TDataSourceConfig.php
index 53a5ef22..bea15ec4 100644
--- a/framework/Data/TDataSourceConfig.php
+++ b/framework/Data/TDataSourceConfig.php
@@ -58,13 +58,13 @@ class TDataSourceConfig extends TModule
 	 */
 	public function init($xml)
 	{
-		if($prop=$xml->getElementByTagName('database'))
-		{
-			$db=$this->getDbConnection();
-			foreach($prop->getAttributes() as $name=>$value)
-				$db->setSubproperty($name,$value);
+			if($prop=$xml->getElementByTagName('database'))
+			{
+				$db=$this->getDbConnection();
+				foreach($prop->getAttributes() as $name=>$value)
+					$db->setSubproperty($name,$value);
+			}
 		}
-	}
 
 	/**
 	 * The module ID of another TDataSourceConfig. The {@link getDbConnection DbConnection}
@@ -153,4 +153,3 @@ class TDataSourceConfig extends TModule
 			throw new TConfigurationException('datasource_dbconnection_invalid',$id);
 	}
 }
-
-- 
cgit v1.2.3