Skip to content

S
syncEnrollments
Commit e8cd58a9 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

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

Fixed connector options merge bug.
parents 19d56d57 c6290d11
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
laravel/database/connectors/connector.php
View file @ e8cd58a9
...@@ -35,7 +35,7 @@ abstract class Connector { ...@@ -35,7 +35,7 @@ abstract class Connector {
{ {
$options = (isset($config['options'])) ? $config['options'] : array(); $options = (isset($config['options'])) ? $config['options'] : array();
return $this->options + $options; return $options + $this->options;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment