From a7ac1908ec591781aed755ed740c1e6df37e96e0 Mon Sep 17 00:00:00 2001
From: Kiyoshi Yamamura <kiyoshi.yamamura@cule.jp>
Date: Tue, 22 Dec 2015 05:51:11 +0900
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E3=82=A4=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=83=BC=E3=83=AB=E6=99=82=E3=81=AB=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=8C=E6=9B=B8=E3=81=8D?=
 =?UTF-8?q?=E8=BE=BC=E3=81=BE=E3=82=8C=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7?=
 =?UTF-8?q?=E5=90=88=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/Install/InstallController.php       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Eccube/Controller/Install/InstallController.php b/src/Eccube/Controller/Install/InstallController.php
index 0c90b71b1aa..46c2f65f287 100644
--- a/src/Eccube/Controller/Install/InstallController.php
+++ b/src/Eccube/Controller/Install/InstallController.php
@@ -254,8 +254,15 @@ 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()
@@ -263,9 +270,6 @@ public function step5(InstallApplication $app, Request $request)
                     ->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();