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

Merge pull request #1444 from eddmann/bug/database-connector 

Fixed connector options merge bug.
This commit is contained in:
Taylor Otwell 2013-01-05 12:17:11 -08:00
parent 19d56d57c9 c6290d11fa
commit e8cd58a9bc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/database/connectors/connector.php
View File

@ -35,7 +35,7 @@ protected function options($config)
{ {
$options = (isset($config['options'])) ? $config['options'] : array(); $options = (isset($config['options'])) ? $config['options'] : array();
return $this->options + $options; return $options + $this->options;
} }
} }