From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001 From: "christophe.boulain" <> Date: Wed, 3 Dec 2008 14:22:03 +0000 Subject: Merge from trunk --- framework/Data/SqlMap/Statements/TMappedStatement.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'framework/Data/SqlMap/Statements/TMappedStatement.php') diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php index 2feeba90..6a9130fe 100644 --- a/framework/Data/SqlMap/Statements/TMappedStatement.php +++ b/framework/Data/SqlMap/Statements/TMappedStatement.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.SqlMap.Statements @@ -561,7 +561,7 @@ class TMappedStatement extends TComponent implements IMappedStatement else $obj = $this->fillDefaultResultMap(null, $row, $resultObject); if(class_exists('TActiveRecord',false) && $obj instanceof TActiveRecord) - //Create a new clean active record. + //Create a new clean active record. $obj=TActiveRecord::createRecord(get_class($obj),$obj); return $obj; } @@ -1115,7 +1115,7 @@ class TSqlMapObjectCollectionTree else if(is_array($list)) $list[] = $this->_entries[$node]['object']; else - throw TSqlMapExecutionException( + throw new TSqlMapExecutionException( 'sqlmap_property_must_be_list'); } @@ -1216,4 +1216,3 @@ class TResultSetMapItemParameter extends TComponent } } -?> -- cgit v1.2.3