Doctrine

Timestamp:

10/02/08 20:47:32 (22 months ago)

Author:

jwage

Message:

[1.1] fixes #632

Location:

branches/1.1/lib/Doctrine

Files:

• Collection.php (modified) (2 diffs)
• Connection/UnitOfWork.php (modified) (1 diff)

branches/1.1/lib/Doctrine/Collection.php

@@ -818 +818 @@
      * @return Doctrine_Collection
      */
-    public function save(Doctrine_Connection $conn = null)
+    public function save(Doctrine_Connection $conn = null, $processDiff = true)
     {
         if ($conn == null) {
@@ -829 +829 @@
             $conn->transaction->addCollection($this);
 
-            $this->processDiff();
+            if ($processDiff) {
+                $this->processDiff();
+            }
 
             foreach ($this->getData() as $key => $record) {

branches/1.1/lib/Doctrine/Connection/UnitOfWork.php

@@ -438 +438 @@
 
             if ($rel instanceof Doctrine_Relation_Association) {
-                $v->save($this->conn);
+                $v->save($this->conn, false);
 
                 $assocTable = $rel->getAssociationTable();