summaryrefslogtreecommitdiff
path: root/framework/Data
diff options
context:
space:
mode:
authorChristophe.Boulain <>2010-01-14 10:39:39 +0000
committerChristophe.Boulain <>2010-01-14 10:39:39 +0000
commit9d3b70421ecdd129bfe32326ba0987ce6425f4f6 (patch)
tree07257387cf6bae0a222eff9db69cecb0812143c6 /framework/Data
parent14ded84e0a9d345a2dff94901f8af77f39555d73 (diff)
Fixed Issue#153
Diffstat (limited to 'framework/Data')
-rw-r--r--framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php4
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;
}