diff options
| author | Christophe.Boulain <> | 2010-01-14 10:39:39 +0000 |
|---|---|---|
| committer | Christophe.Boulain <> | 2010-01-14 10:39:39 +0000 |
| commit | 9d3b70421ecdd129bfe32326ba0987ce6425f4f6 (patch) | |
| tree | 07257387cf6bae0a222eff9db69cecb0812143c6 | |
| parent | 14ded84e0a9d345a2dff94901f8af77f39555d73 (diff) | |
Fixed Issue#153
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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 - <connection> 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 <weizhuo[at]gmail[dot]com>
* @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;
}
|