Doctrine

Timestamp:

01/19/08 02:41:26 (18 months ago)

Author:

dbrewer

Message:

Merged r3550 from 0.9 to 0.10 branch.

Files:

• branches/0.10/lib/Doctrine/Record.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/Record.php

@@ -426 +426 @@
      * cleanData
      * 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
@@ -439 +440 @@
             if (isset($tmp[$fieldName])) {
                 $data[$fieldName] = $tmp[$fieldName];
+            } else if (array_key_exists($fieldName, $tmp)) {
+                $data[$fieldName] = self::$_null;
             } else if (!isset($this->_data[$fieldName])) {
                 $data[$fieldName] = self::$_null;