fix config cache

summerblue · May 1, 2020 · 571da49 · 571da49
1 parent c82715c
commit 571da49
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Frozennode/Administrator/AdministratorServiceProvider.php b/src/Frozennode/Administrator/AdministratorServiceProvider.php
@@ -122,10 +122,15 @@ public function setLocale()
     public function fixConfigAndRouteCacheIfNeeded()
     {
         // Hack for laravel config cache
-
         $file = config_path('administrator.php');
         if (file_exists($file)) {
-            $this->mergeConfigFrom($file, 'administrator');
+
+            if ($this->app->configurationIsCached()) {
+                $this->app['config']->set('administrator', array_merge(
+                    require $file, $this->app['config']->get('administrator', [])
+                ));
+            }
+
             if (app()->runningInConsole()) {
                 $configs = \Config::get('administrator');
                 $configs = $this->filter_recursive($configs);