Skip to content

Commit

Permalink
fix file not exists
Browse files Browse the repository at this point in the history
  • Loading branch information
summerblue committed Sep 20, 2019
1 parent 32967f6 commit a8e5cab
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/Frozennode/Administrator/AdministratorServiceProvider.php
Expand Up @@ -122,11 +122,14 @@ public function setLocale()
public function fixConfigAndRouteCacheIfNeeded()
{
// Hack for laravel config cache
$this->mergeConfigFrom(config_path('administrator.php'), 'administrator');
if (app()->runningInConsole()) {
$configs = \Config::get('administrator');
$configs = $this->filter_recursive($configs);
\Config::set('administrator', $configs);
$file = config_path('administrator.php');
if (file_exists($file)) {
$this->mergeConfigFrom($file, 'administrator');
if (app()->runningInConsole()) {
$configs = \Config::get('administrator');
$configs = $this->filter_recursive($configs);
\Config::set('administrator', $configs);
}
}
}

Expand Down

0 comments on commit a8e5cab

Please sign in to comment.