Ticket #2358: patch.txt

Index: C:/Documents and Settings/Sylvain/workspace/sfPropelActAsNestedSetBehaviorPlugin/lib/sfPropelActAsNestedSetBehavior.class.php
===================================================================
--- C:/Documents and Settings/Sylvain/workspace/sfPropelActAsNestedSetBehaviorPlugin/lib/sfPropelActAsNestedSetBehavior.class.php   (revision 5454)
+++ C:/Documents and Settings/Sylvain/workspace/sfPropelActAsNestedSetBehaviorPlugin/lib/sfPropelActAsNestedSetBehavior.class.php   (working copy)
@@ -74,7 +74,7 @@
    */
   public function preSave(BaseObject $node)
   {
-    $this->processPreSaveStack();
+    $this->processPreSaveStack($node);
   }
 
   /**
@@ -110,12 +110,13 @@
                        self::getColumnConstant($node_class, 'parent'),
                        $node->getPrimaryKey());
 
-      $con = Propel::getConnection();
+      $x=new ReflectionClass($peer_name);
+      $con = Propel::getConnection($x->getConstant('DATABASE_NAME'));
       $statement = $con->createStatement();
       $statement->execute($query);
     }
     
-    $this->processPreDeleteStack();
+    $this->processPreDeleteStack($node);
   }
 
 # -- GETTERS AND SETTERS
@@ -482,7 +483,8 @@
   public function getNumberOfChildren(BaseObject $node)
   {
     $peer_name = get_class($node->getPeer());
-    $con = Propel::getConnection();
+    $x=new ReflectionClass($peer_name);
+    $con = Propel::getConnection($x->getConstant('DATABASE_NAME'));
     $scope_sql = '';
     if (!is_null($node->getScopeIdValue()))
     {
@@ -532,7 +534,8 @@
     {
       $peer_name = get_class($node->getPeer());
   
-      $con = Propel::getConnection();
+      $x=new ReflectionClass($peer_name);
+      $con = Propel::getConnection($x->getConstant('DATABASE_NAME'));
       $stmt = $con->createStatement();
       
       $scope_sql = '';
@@ -1051,7 +1054,7 @@
   /**
    * Processes presave stack : runs stacked queries and saves stackes objects.
    */
-  private function processStack($stack_name)
+  private function processStack($stack_name, $node)
   {
     foreach ($this->$stack_name as $action)
     {
@@ -1065,7 +1068,8 @@
       // stack entry is an sql query, let's execute it
       elseif (is_string($action))
       {
-        $con = Propel::getConnection();
+        $x=new ReflectionClass(get_class($node->getPeer()));
+        $con = Propel::getConnection($x->getConstant('DATABASE_NAME'));
         $statement = $con->createStatement();
         $result = $statement->executeQuery($action);
       }
@@ -1078,14 +1082,14 @@
     }
   }
 
-  private function processPreDeleteStack()
+  private function processPreDeleteStack($node)
   {
-    $this->processStack('predelete_stack');
+    $this->processStack('predelete_stack',$node);
   }
 
-  private function processPreSaveStack()
+  private function processPreSaveStack($node)
   {
-    $this->processStack('presave_stack');
+    $this->processStack('presave_stack',$node);
   }
 
   /**