Skip to content

Commit

Permalink
新規インストール時に設定ファイルが書き込まれない不具合修正
Browse files Browse the repository at this point in the history
  • Loading branch information
k-yamamura committed Dec 21, 2015
1 parent 23b485d commit a7ac190
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/Eccube/Controller/Install/InstallController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
Expand Down

0 comments on commit a7ac190

Please sign in to comment.