From c6290d11fab6a6f41b5b301324286a45f69a3053 Mon Sep 17 00:00:00 2001 From: Edward Mann Date: Wed, 14 Nov 2012 18:57:46 +0000 Subject: [PATCH] Fixed connector options merge bug. Fixed issue with options ordering when merging the default and user values into one array. --- laravel/database/connectors/connector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/database/connectors/connector.php b/laravel/database/connectors/connector.php index 01065583..93be707e 100644 --- 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; } } \ No newline at end of file