RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

Merged r3550 from 0.9 branch to trunk.

Browse Source
This commit is contained in:
dbrewer 2008-01-19 02:35:39 +00:00
parent 04e4a9ce26
commit 4b95d0504c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/Record.php
View File

@ -445,7 +445,8 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
/** /**
* cleanData * cleanData
* leaves the $data array only with values whose key is a field inside this * leaves the $data array only with values whose key is a field inside this
* record and returns the values that where removed from $data. * record and returns the values that were removed from $data. Also converts
* any values of 'null' to objects of type Doctrine_Null.
* *
* @param array $data data array to be cleaned * @param array $data data array to be cleaned
* @return array $tmp values cleaned from data * @return array $tmp values cleaned from data
@ -459,6 +460,8 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
foreach ($fieldNames as $fieldName) { foreach ($fieldNames as $fieldName) {
if (isset($tmp[$fieldName])) { if (isset($tmp[$fieldName])) {
$data[$fieldName] = $tmp[$fieldName]; $data[$fieldName] = $tmp[$fieldName];
} else if (array_key_exists($fieldName, $tmp)) {
$data[$fieldName] = self::$_null;
} else if (!isset($this->_data[$fieldName])) { } else if (!isset($this->_data[$fieldName])) {
$data[$fieldName] = self::$_null; $data[$fieldName] = self::$_null;
} }