Change of AR due to introduction of column mapping.

1 files changed, 2 insertions, 2 deletions

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
index 7e942e67..0e176607 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
@@ -215,7 +215,7 @@ class TActiveRecordHasManyAssociation extends TActiveRecordRelation
 		{

 			$i=0;

 			foreach($foreignKeys as $ref=>$fk)

-				$obj->{$ref} = $row[$this->_association_columns[$i++]];

+				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);

 		}

 		return $obj;

 	}

@@ -372,7 +372,7 @@ class TActiveRecordHasManyAssociation extends TActiveRecordRelation
 	{

 		$data=array();

 		foreach($foreignKeys as $name=>$fKey)

-			$data[$name] = $fkObject->{$fKey};

+			$data[$name] = $fkObject->getColumnValue($fKey);

 		return $data;

 	}

 }