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

Fixed connector options merge bug.

Merge pull request #1444 from eddmann/bug/database-connector
Fixed connector options merge bug.
e8cd58a9 · Taylor Otwell · 19d56d57 · c6290d11 · e8cd58a9
Commit e8cd58a9 authored Jan 05, 2013 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

connector.php laravel/database/connectors/connector.php +1 -1

No files found.
--- 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;
 	}

 }
\ No newline at end of file