Changeset 4707

Timestamp:

07/23/08 22:25:44 (4 months ago)

Author:

guilhermeblanco

Message:

Better solution to ticket #1268.

Location:

branches

Files:

• 0.11/lib/Doctrine/Tree/NestedSet.php (modified) (2 diffs)
• 1.0/lib/Doctrine/Tree/NestedSet.php (modified) (2 diffs)

branches/0.11/lib/Doctrine/Tree/NestedSet.php

@@ -161 +161 @@
         $q = $this->returnQueryWithRootId($q, $rootId);
         
-        // FIX: Reported in ticket #1268
-        if ($hydrationMode !== null) {
-            $q = $q->setHydrationMode($hydrationMode);
-        }
-
-        $tree = $q->execute();
+        $tree = $q->execute(array(), $hydrationMode);
 
         if (count($tree) <= 0) {
@@ -199 +194 @@
         $q = $this->returnQueryWithRootId($q, $record->getNode()->getRootValue());
         
-        // FIX: Reported in ticket #1268
-        if ($hydrationMode !== null) {
-            $q = $q->setHydrationMode($hydrationMode);
-        }
-
-        return $q->execute();
+        return $q->execute(array(), $hydrationMode);
     }
 

branches/1.0/lib/Doctrine/Tree/NestedSet.php

@@ -161 +161 @@
         $q = $this->returnQueryWithRootId($q, $rootId);
 
-        // FIX: Reported in ticket #1268
-        if ($hydrationMode !== null) {
-            $q = $q->setHydrationMode($hydrationMode);
-        }
-
-        $tree = $q->execute();
+        $tree = $q->execute(array(), $hydrationMode);
 
         if (count($tree) <= 0) {
@@ -198 +193 @@
                 ->addOrderBy($this->_baseAlias . ".lft asc");
         $q = $this->returnQueryWithRootId($q, $record->getNode()->getRootValue());
-        
-        // FIX: Reported in ticket #1268
-        if ($hydrationMode !== null) {
-            $q = $q->setHydrationMode($hydrationMode);
-        }
-
-        return $q->execute();
+
+        return $q->execute(array(), $hydrationMode);
     }