+ reinclude main config in StartController

hiqdev · Oct 17, 2016 · 9e02ac4 · 9e02ac4
1 parent a6b26f5
commit 9e02ac4
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/controllers/StartController.php b/src/controllers/StartController.php
@@ -37,8 +37,9 @@ class StartController extends CommonController
      */
     public function actionMake()
     {
+        self::$started = true;
         $this->getRootDir();
-        $this->takeConfig()->includeConfig('.hidev/config.yml');
+        $this->includeMainConfig();
         if (file_exists('.hidev/config-local.yml')) {
             $this->takeConfig()->includeConfig('.hidev/config-local.yml');
         }
@@ -47,7 +48,12 @@ public function actionMake()
         $this->requireAll();
         $this->includeAll();
         $this->loadConfig();
-        self::$started = true;
+        $this->includeMainConfig();
+    }
+
+    public function includeMainConfig()
+    {
+        $this->takeConfig()->includeConfig('.hidev/config.yml');
     }
 
     public function addAutoloader()