diff --git a/src/Providers/ConfigServiceProvider.php b/src/Providers/ConfigServiceProvider.php index 50806334..d4924d39 100755 --- a/src/Providers/ConfigServiceProvider.php +++ b/src/Providers/ConfigServiceProvider.php @@ -44,24 +44,10 @@ public function boot() */ protected function registerMailServices() { - $this->app['config']['services'] = [ - - // SparkPost service settings.. - 'sparkpost' => [ - 'secret' => setting('mail.mail_sparkpost_secret'), - ], - - // Mailgun service settings.. - 'mailgun' => [ - 'domain' => setting('mail.mail_mailgun_domain'), - 'secret' => setting('mail.mail_mailgun_secret'), - ], - - // Mandrill service settings.. - 'mandrill' => [ - 'secret' => setting('mail.mail_mandrill_secret'), - ], - ]; + config(['sparkpost.secret' => setting('mail.mail_sparkpost_secret')]); + config(['mailgun.domain' => setting('mail.mail_mailgun_domain')]); + config(['mailgun.secret' => setting('mail.mail_mailgun_secret')]); + config(['mandrill.secret' => setting('mail.mail_mandrill_secret')]); } /** @@ -81,7 +67,6 @@ protected function registerMacro() if (is_array($value) && is_array($arr2[$key])) { $output[$key] = Arr::mergeDeep($value, $arr2[$key]); - $output[$key] = array_unique($output[$key], SORT_REGULAR); } } @@ -116,8 +101,8 @@ protected function mergeFusionCMSConfigurations() $this->app['config']->set( $name, Arr::mergeDeep( - $this->app['config']->get($name, []), require $path, + $this->app['config']->get($name, []), ) ); }