github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify duplicate conditionals

pull/9/head
Franz Liedke 2015-08-27 12:05:14 +02:00
parent 2208271c77
commit e7092b841c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flarum/bootstrap.php
View File

@ -102,15 +102,13 @@ $serviceProviders = [
'Illuminate\Validation\ValidationServiceProvider', 'Illuminate\Validation\ValidationServiceProvider',
]; ];
if (Core::isInstalled()) {
$serviceProviders[] = 'Flarum\Core\CoreServiceProvider';
}
foreach ($serviceProviders as $provider) { foreach ($serviceProviders as $provider) {
$app->register(new $provider($app)); $app->register(new $provider($app));
} }
if (Core::isInstalled()) { if (Core::isInstalled()) {
$app->register(new \Flarum\Core\CoreServiceProvider($app));
$config->set('mail.driver', Core::config('mail_driver')); $config->set('mail.driver', Core::config('mail_driver'));
$config->set('mail.host', Core::config('mail_host')); $config->set('mail.host', Core::config('mail_host'));
$config->set('mail.port', Core::config('mail_port')); $config->set('mail.port', Core::config('mail_port'));