From 46f2cbe4268c372339a88df13f8200a7f5cf8320 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Fri, 25 Aug 2006 17:13:21 +0000
Subject: [PATCH] Fixed cleanData method

---
 Doctrine/Record.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Doctrine/Record.php b/Doctrine/Record.php
index 4c961ca2a..33ef42f67 100644
--- a/Doctrine/Record.php
+++ b/Doctrine/Record.php
@@ -270,7 +270,9 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
                     case "object":
 
                         if($tmp[$name] !== self::$null) {
-                            $value = unserialize($tmp[$name]);
+                            if( ! is_array($tmp[$name] && ! is_object($tmp[$name]))
+                                $value = unserialize($tmp[$name]);
+                            
                             if($value === false)
                                 throw new Doctrine_Exception("Unserialization of $name failed. ".var_dump($tmp[$name],true));
 
@@ -1243,6 +1245,15 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
     final public function hasColumn($name, $type, $length = 20, $options = "") {
         $this->table->setColumn($name, $type, $length, $options);
     }
+    /**
+     * countRelated
+     */
+    public function countRelated($name) {
+        $rel   = $this->table->getForeignKey($name);
+        $componentName = $rel->getTable()->getTableName();
+
+        return $rel->getCountFor($this);
+    }
     /**
      * merge
      *