Doctrine

Timestamp:

10/15/08 20:09:04 (9 months ago)

Author:

jwage

Message:

[1.0, 1.1] fixes #1556 - issue with query registry not storing copies of queries

Location:

branches

Files:

• 1.0/lib/Doctrine/Query/Registry.php (modified) (2 diffs)
• 1.1/lib/Doctrine/Query/Registry.php (modified) (2 diffs)

branches/1.0/lib/Doctrine/Query/Registry.php

@@ -37 +37 @@
     public function add($key, $query)
     {
+        if ($query instanceof Doctrine_Query) {
+            $query = clone $query;
+        }
+
         if (strpos($key, '/') === false) {
             $this->_queries[$key] = $query;
@@ -66 +70 @@
         }
         
-        return $query;
+        return clone $query;
     }
     

branches/1.1/lib/Doctrine/Query/Registry.php

@@ -37 +37 @@
     public function add($key, $query)
     {
+        if ($query instanceof Doctrine_Query) {
+            $query = clone $query;
+        }
+
         if (strpos($key, '/') === false) {
             $this->_queries[$key] = $query;
@@ -66 +70 @@
         }
         
-        return $query;
+        return clone $query;
     }