Fixed Issue#153

1 files changed, 3 insertions, 1 deletions

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;

 	}