Commit 732bc89a authored by zYne's avatar zYne

fixes #300

parent a3ceef45
...@@ -81,7 +81,6 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator ...@@ -81,7 +81,6 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
{ {
if ( ! ($table instanceof Doctrine_Table)) { if ( ! ($table instanceof Doctrine_Table)) {
$table = Doctrine_Manager::getInstance() $table = Doctrine_Manager::getInstance()
->getCurrentConnection()
->getTable($table); ->getTable($table);
} }
$this->table = $table; $this->table = $table;
......
...@@ -522,7 +522,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite ...@@ -522,7 +522,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
public function unserialize($serialized) public function unserialize($serialized)
{ {
$manager = Doctrine_Manager::getInstance(); $manager = Doctrine_Manager::getInstance();
$connection = $manager->getCurrentConnection(); $connection = $manager->getConnectionForComponent(get_class($this));
$this->oid = self::$index; $this->oid = self::$index;
self::$index++; self::$index++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment