Merge pull request #1347 from k-yamamura/bugfix-install

新規インストール時に設定ファイルが書き込まれない不具合修正
EC-CUBE · Dec 22, 2015 · 8d5d227 · 8d5d227
2 parents 23b485d + a7ac190
commit 8d5d227
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Eccube/Controller/Install/InstallController.php b/src/Eccube/Controller/Install/InstallController.php
@@ -254,18 +254,22 @@ public function step5(InstallApplication $app, Request $request)
         $form->setData($sessionData);
 
         if ($this->isValid($request, $form)) {
+
+            $this
+                ->createDatabaseYamlFile($sessionData)
+                ->createMailYamlFile($sessionData)
+                ->createPathYamlFile($sessionData, $request);
+
             if (!$form['no_update']->getData()) {
                 set_time_limit(0);
+                $this->createConfigYamlFile($sessionData);
 
                 $this
                     ->setPDO()
                     ->dropTables()
                     ->createTables()
                     ->doMigrate()
                     ->insert();
-
-                $this->createConfigYamlFile($sessionData);
-
             } else {
                 // データベースを初期化しない場合、auth_magicは初期化しない
                 $this->createConfigYamlFile($sessionData, false);
@@ -276,10 +280,6 @@ public function step5(InstallApplication $app, Request $request)
 
             }
 
-            $this
-                ->createDatabaseYamlFile($sessionData)
-                ->createMailYamlFile($sessionData)
-                ->createPathYamlFile($sessionData, $request);
 
             if (isset($sessionData['agree']) && $sessionData['agree'] == '1') {
                 $host = $request->getSchemeAndHttpHost();