Skip to content

Commit

Permalink
Merge pull request #2048 from eccubevn/bug_fix_#1182
Browse files Browse the repository at this point in the history
インストーラでの推奨ライブラリの表示をInfoレベルに変更 #1182
  • Loading branch information
chihiro-adachi authored Jan 31, 2017
2 parents d7924a7 + 196bd3f commit d14e721
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Eccube/Controller/Install/InstallController.php
Original file line number Diff line number Diff line change
Expand Up @@ -348,17 +348,17 @@ private function checkModules($app)
//http://php.net/manual/en/migration71.deprecated.php
continue;
}
$app->addWarning('[推奨] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
$app->addInfo('[推奨] '.$module.' 拡張モジュールが有効になっていません。', 'install');
}
}

if ('\\' === DIRECTORY_SEPARATOR) { // for Windows
if (!extension_loaded('wincache')) {
$app->addWarning('[推奨] WinCache 拡張モジュールが有効になっていません。', 'install');
$app->addInfo('[推奨] WinCache 拡張モジュールが有効になっていません。', 'install');
}
} else {
if (!extension_loaded('apc')) {
$app->addWarning('[推奨] APC 拡張モジュールが有効になっていません。', 'install');
$app->addInfo('[推奨] APC 拡張モジュールが有効になっていません。', 'install');
}
}

Expand Down
11 changes: 11 additions & 0 deletions src/Eccube/Resource/template/install/step1.twig
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</div>
{% endfor %}
{% endif %}
{#info section#}
{% if app.session.flashBag.has('eccube.install.info') %}
{% for message in app.session.flashBag.get('eccube.install.info') %}
<div class="row">
<div class="alert alert-info alert-dismissable alert-section">
<button type="button" class="close" data-dismiss="alert"><span class="alert-close" aria-hidden="true">&times;</span></button>
<svg class="cb cb-info-circle"> <use xlink:href="#cb-info-circle" /></svg> {{ message|trans }}
</div>
</div>
{% endfor %}
{% endif %}
<div class="page-header">
<h1>ようこそ</h1>
</div>
Expand Down

0 comments on commit d14e721

Please sign in to comment.