From 732bc89a8971fcf6c336ea07439b66bd2d378177 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 31 Mar 2007 19:49:23 +0000
Subject: [PATCH] fixes #300

---
 lib/Doctrine/Collection.php | 1 -
 lib/Doctrine/Record.php     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/Doctrine/Collection.php b/lib/Doctrine/Collection.php
index 811c4b015..533047656 100644
--- a/lib/Doctrine/Collection.php
+++ b/lib/Doctrine/Collection.php
@@ -81,7 +81,6 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
     {
         if ( ! ($table instanceof Doctrine_Table)) {
             $table = Doctrine_Manager::getInstance()
-                        ->getCurrentConnection()
                         ->getTable($table);
         }
         $this->table = $table;
diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
index b786e296f..8ca14f112 100644
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -522,7 +522,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
     public function unserialize($serialized)
     {
         $manager    = Doctrine_Manager::getInstance();
-        $connection    = $manager->getCurrentConnection();
+        $connection = $manager->getConnectionForComponent(get_class($this));
 
         $this->oid  = self::$index;
         self::$index++;