From 94e94e0a8566f23d16658a04c55b0bbfdd6689aa Mon Sep 17 00:00:00 2001
From: "godzilla80@gmx.net" <>
Date: Sun, 14 Feb 2010 01:22:57 +0000
Subject: Merge Branches & Trunk /trunk:r2680,2692,2707-2736
 /branches/3.1:r2682-2686,2694-2702,2705,2738-2762

---
 framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php       | 2 +-
 framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Data/SqlMap/Configuration')

diff --git a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
index d85148eb..540a3acd 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
@@ -97,7 +97,7 @@ class TSqlMapCacheModel extends TComponent
 	public function initialize($cache=null)
 	{
 		if($cache===null)
-			$this->_cache= Prado::createComponent($this->getImplementationClass());
+			$this->_cache= Prado::createComponent($this->getImplementationClass(), $this);
 		else
 			$this->_cache=$cache;
 	}
diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
index f6e0acd5..c49a4219 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
@@ -710,7 +710,7 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 			if(in_array(strtolower($name), $properties))
 				$cacheModel->{'set'.$name}((string)$value);
 		}
-		$cache = Prado::createComponent($cacheModel->getImplementationClass());
+		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
 		$this->setObjectPropFromNode($cache,$node,$properties);
 
 		foreach($node->xpath('property') as $propertyNode)
-- 
cgit v1.2.3