Changeset 4706 for branches/0.11/lib/Doctrine/Tree/NestedSet.php

Timestamp:

07/23/08 22:21:13 (6 months ago)

Author:

guilhermeblanco

Message:

Fixes #1268 and fixes #1260. Fixed test case of #1250. Updated documentation to support changes. Remove BC break of fetchTree and also Pager is now aware of Hydration mode defined in Query object.

Files:

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

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

@@ -159 +159 @@
         }
 
-        $q = $this->returnQueryWithRootId($q, $rootId)->setHydrationMode($hydrationMode);
+        $q = $this->returnQueryWithRootId($q, $rootId);
+        
+        // FIX: Reported in ticket #1268
+        if ($hydrationMode !== null) {
+            $q = $q->setHydrationMode($hydrationMode);
+        }
+
         $tree = $q->execute();
 
@@ -191 +197 @@
         $q->addWhere($this->_baseAlias . ".lft >= ? AND " . $this->_baseAlias . ".rgt <= ?", $params)
                 ->addOrderBy($this->_baseAlias . ".lft asc");
-        $q = $this->returnQueryWithRootId($q, $record->getNode()->getRootValue())
-            ->setHydrationMode($hydrationMode);
+        $q = $this->returnQueryWithRootId($q, $record->getNode()->getRootValue());
+        
+        // FIX: Reported in ticket #1268
+        if ($hydrationMode !== null) {
+            $q = $q->setHydrationMode($hydrationMode);
+        }
+
         return $q->execute();
     }