From ea0601cdd4a732fc15b83104a47788989bb004b3 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Mon, 30 Apr 2007 03:44:49 +0000
Subject: Reverted TActiveRecord::populateObject to protected

---
 framework/Data/ActiveRecord/TActiveRecordStateRegistry.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Data/ActiveRecord/TActiveRecordStateRegistry.php')

diff --git a/framework/Data/ActiveRecord/TActiveRecordStateRegistry.php b/framework/Data/ActiveRecord/TActiveRecordStateRegistry.php
index ef415b5e..691090dc 100644
--- a/framework/Data/ActiveRecord/TActiveRecordStateRegistry.php
+++ b/framework/Data/ActiveRecord/TActiveRecordStateRegistry.php
@@ -54,13 +54,13 @@ class TActiveRecordStateRegistry
 	 * @param mixed row data fetched
 	 * @return TActiveRecord cached object if found, null otherwise.
 	 */
-	public function getCachedInstance($data)
+	public function getCachedInstance($data,$mustBeClean=true)
 	{
 		$key = $this->getObjectDataKey($data);
 		if(isset($this->_cachedObjects[$key]))
 		{
 			$obj = $this->_cachedObjects[$key];
-			if($this->getIsCleanObject($obj))
+			if(!($mustBeClean && !$this->getIsCleanObject($obj)))
 				return $obj;
 		}
 	}
-- 
cgit v1.2.3