From 5d79089d1fca522eb2fd1250bc597b405db057be Mon Sep 17 00:00:00 2001
From: meus <meus@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 21 Jul 2007 16:49:52 +0000
Subject: [PATCH] =?UTF-8?q?fixes=20#395=20applied=20Antik=C2=B4s=20patch?=
 =?UTF-8?q?=20and=20ran=20tests.=201=20less=20failure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/Doctrine/Table.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php
index 5cecbac33..72756776d 100644
--- a/lib/Doctrine/Table.php
+++ b/lib/Doctrine/Table.php
@@ -1176,8 +1176,10 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
      */
     public function prepareValue($field, $value)
     {
-        if ($value === null || $value === self::$_null) {
+        if ($value === self::$_null) {
             return self::$_null;
+        } else if ($value === null) {
+            return null;
         } else {
             $type = $this->getTypeOf($field);