From 9d3b70421ecdd129bfe32326ba0987ce6425f4f6 Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Thu, 14 Jan 2010 10:39:39 +0000
Subject: Fixed Issue#153

---
 framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'framework/Data/ActiveRecord/Relations')

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
index a3daf35c..7e584514 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Data.ActiveRecord.Relations
@@ -85,6 +85,8 @@ abstract class TActiveRecordRelation
 		}
 		else if($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
+		else if($results === null || !$validArray)
+			$stacks=array();
 		return $results;
 	}
 
-- 
cgit v1.2.3