RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-02 21:06:18 +03:00
Code Issues Projects Releases Wiki Activity

fixes #300

Browse source
This commit is contained in:
zYne 2007-03-31 19:49:23 +00:00
parent a3ceef45cb
commit 732bc89a89
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Doctrine/Collection.php
View file

@ -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;

2
lib/Doctrine/Record.php
View file

@ -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++;