Fixed connector options merge bug.

Fixed issue with options ordering when merging the default and user values into one array.
2012-11-14 18:57:46 +00:00
parent d2fefa65aa
commit c6290d11fa
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 @@ abstract class Connector {
 	{
 		$options = (isset($config['options'])) ? $config['options'] : array();

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

 }