From 659ace8003eac43451f6febc5538bfe6f9490d3d Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 3 Aug 2016 11:26:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AEapplication.yml=E3=81=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=A0=B4=E5=90=88=E3=80=81Notice=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/bootstrap.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Config/bootstrap.php b/Config/bootstrap.php index de96a3f8..f2697718 100644 --- a/Config/bootstrap.php +++ b/Config/bootstrap.php @@ -42,3 +42,9 @@ App::uses('Router', 'Routing'); Router::parseExtensions(); + +//インストールのapplication.ymlがない場合、Noticeになるため +if (! Configure::read('NetCommons.installed')) { + App::uses('InstallUtil', 'Install.Utility'); + $InstallUtil = new InstallUtil(); +} From 9fea5c701f4dfc41245ea56b6464b3ead3563b72 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 3 Aug 2016 12:40:02 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=87=A6=E7=90=86?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Layouts/default.ctp | 1 - 1 file changed, 1 deletion(-) diff --git a/View/Layouts/default.ctp b/View/Layouts/default.ctp index 328590fd..cc1c12b9 100644 --- a/View/Layouts/default.ctp +++ b/View/Layouts/default.ctp @@ -7,7 +7,6 @@ * @link http://www.netcommons.org NetCommons Project * @license http://www.netcommons.org/license.txt NetCommons License */ -$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework'); ?> From dccdb93843b7aec40e0ee6e6b51f91f8b6d8ec3d Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 3 Aug 2016 13:08:46 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AEapplication.yml=E3=81=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=A0=B4=E5=90=88=E3=80=81Notice=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config/bootstrap.php b/Config/bootstrap.php index f2697718..abe8c035 100644 --- a/Config/bootstrap.php +++ b/Config/bootstrap.php @@ -44,7 +44,7 @@ Router::parseExtensions(); //インストールのapplication.ymlがない場合、Noticeになるため -if (! Configure::read('NetCommons.installed')) { +if (! Configure::read('NetCommons.installed') && CakePlugin::loaded('Install')) { App::uses('InstallUtil', 'Install.Utility'); $InstallUtil = new InstallUtil(); }