Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1434 from franzliedke/patch-59 

My take at #1198
This commit is contained in:
Taylor Otwell 2013-01-05 12:28:00 -08:00
parent e8cd58a9bc 172ebcb00d
commit 10b8732583
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
laravel/database/eloquent/pivot.php
View File

@ -7,7 +7,14 @@ class Pivot extends Model {
* *
* @var string * @var string
*/ */
public $pivot_table; protected $pivot_table;
/**
* The database connection used for this model.
*
* @var Laravel\Database\Connection
*/
protected $pivot_connection;
/** /**
* Indicates if the model has update and creation timestamps. * Indicates if the model has update and creation timestamps.
@ -26,7 +33,7 @@ class Pivot extends Model {
public function __construct($table, $connection = null) public function __construct($table, $connection = null)
{ {
$this->pivot_table = $table; $this->pivot_table = $table;
static::$connection = $connection; $this->pivot_connection = $connection;
parent::__construct(array(), true); parent::__construct(array(), true);
} }
@ -41,4 +48,14 @@ public function table()
return $this->pivot_table; return $this->pivot_table;
} }
/**
* Get the connection used by the pivot table.
*
* @return string
*/
public function connection()
{
return $this->pivot_connection;
}
} }