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 --- HISTORY | 1 + framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/HISTORY b/HISTORY index f60175c3..5f49d582 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,6 @@ Version 3.1.7 To be released BUG: Issue#151 - TTextBox fails to display inital line break (Yves) +BUG: Issue#153 - Bug with calls like MyActiveRedorc->withText()->withUser()->find(...) and null result (Christophe) BUG: Issue#157 - Enabled does not work properly on TActiveRadioButton/CheckBoxList controls (Bradley, Carl) BUG: Issue#166 - E_NOTICE level error in TDataGatewayCommand (Carl) BUG: Issue#171 - tag in SqlMap config ignored in 3.1.5 and above, introduced by solving Issue#68 (Yves) 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 * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 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