refactoring.

2011-09-27 21:10:32 -05:00
parent ed3e3e73cc
commit c6f9734603
15 changed files with 253 additions and 178 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 array_merge($this->options, $options);
+		return $this->options + $options;
 	}

 }