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

Fixed connector options merge bug.
2013-01-05 12:17:11 -08:00 · 2013-01-05 12:17:11 -08:00 · e8cd58a9bc
parent 19d56d57c9 c6290d11fa
commit e8cd58a9bc
1 changed files with 1 additions and 1 deletions
--- a/laravel/database/connectors/connector.php
+++ b/laravel/database/connectors/connector.php
@ -35,7 +35,7 @@ protected function options($config)
 	{
 		$options = (isset($config['options'])) ? $config['options'] : array();

-		return $this->options + $options;
+		return $options + $this->options;
 	}

 }