From ad0d24ff573a80685546d2ab5f6295266781a6e7 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 8 May 2008 21:04:34 +0000
Subject: [PATCH] Fixed #1023. Thanks for ticket & patch.

---
 lib/Doctrine/Node/NestedSet.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/Doctrine/Node/NestedSet.php b/lib/Doctrine/Node/NestedSet.php
index aca7a6687..0c5dc534b 100644
--- a/lib/Doctrine/Node/NestedSet.php
+++ b/lib/Doctrine/Node/NestedSet.php
@@ -350,15 +350,28 @@ class Doctrine_Node_NestedSet extends Doctrine_Node implements Doctrine_Node_Int
         if ($dest->getNode()->isRoot()) {
             return false;
         }
-        $newRoot = $dest->getNode()->getRootValue();
-        $this->shiftRLValues($dest->getNode()->getLeftValue(), 1, $newRoot);
-        $this->shiftRLValues($dest->getNode()->getRightValue() + 2, 1, $newRoot);
         
-        $newLeft = $dest->getNode()->getLeftValue();
+        $newLeft  = $dest->getNode()->getLeftValue();
         $newRight = $dest->getNode()->getRightValue() + 2;
-
-        $this->record['level'] = $dest['level'] - 1;
-        $this->insertNode($newLeft, $newRight, $newRoot);
+        $newRoot  = $dest->getNode()->getRootValue();
+		$newLevel = $dest->getNode()->getLevel();
+		
+		// Make space for new node
+        $this->shiftRLValues($dest->getNode()->getRightValue() + 1, 2, $newRoot);
+        
+        // Slide child nodes over one and down one to allow new parent to wrap them
+		$componentName = $this->_tree->getBaseComponent();		
+        $q = new Doctrine_Query();
+        $q->update($componentName);
+        $q->set("$componentName.lft", "$componentName.lft + 1");
+        $q->set("$componentName.rgt", "$componentName.rgt + 1");
+        $q->set("$componentName.level", "$componentName.level + 1");
+        $q->where("$componentName.lft >= ? AND $componentName.rgt <= ?", array($newLeft, $newRight));
+		$q = $this->_tree->returnQueryWithRootId($q, $newRoot);
+		$q->execute();
+        
+        $this->record['level'] = $newLevel;
+		$this->insertNode($newLeft, $newRight, $newRoot);
         
         return true;
     }