Doctrine

Timestamp:

12/18/08 02:09:37 (7 months ago)

Author:

jwage

Message:

[1.1] Fixed infinite loop problem with isValid() (closes #1750)

Files:

• branches/1.1/lib/Doctrine/Record.php (modified) (3 diffs)

branches/1.1/lib/Doctrine/Record.php

@@ -326 +326 @@
             return true;
         }
+
+        if ($this->_state == self::STATE_LOCKED || $this->_state == self::STATE_TLOCKED) {
+            return true;
+        }
+
         // Clear the stack from any previous errors.
         $this->getErrorStack()->clear();
@@ -351 +356 @@
         $valid = $this->getErrorStack()->count() == 0 ? true : false;
         if ($valid) {
+            $stateBeforeLock = $this->_state;
+            $this->_state = $this->exists() ? self::STATE_LOCKED : self::STATE_TLOCKED;
+
             foreach ($this->_references as $reference) {
                 if ($reference instanceof Doctrine_Record) {
@@ -364 +372 @@
                 }
             }
-        }
+            $this->_state = $stateBeforeLock;
+        }
+
         return $valid;
     }