From 6867138f0a7435145962afb8cf38e403fc15ea4b Mon Sep 17 00:00:00 2001 From: wangke Date: Mon, 29 Dec 2014 21:47:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E5=AE=89=E8=A3=85=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E5=AE=8C=E5=96=84"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 13a5f8601ca7578da22c512ec5a2b9d62bf103a3. --- Application/Install/Controller/IndexController.class.php | 2 +- Application/Install/Controller/InstallController.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Install/Controller/IndexController.class.php b/Application/Install/Controller/IndexController.class.php index 5e224fe..ed51296 100644 --- a/Application/Install/Controller/IndexController.class.php +++ b/Application/Install/Controller/IndexController.class.php @@ -42,7 +42,7 @@ public function complete(){ } // 写入安装锁定文件 - //Storage::put(MODULE_PATH . 'Data/install.lock', 'lock'); + Storage::put(MODULE_PATH . 'Data/install.lock', 'lock'); //创建配置文件 $this->assign('info',session('config_file')); diff --git a/Application/Install/Controller/InstallController.class.php b/Application/Install/Controller/InstallController.class.php index 5702c30..dacbc88 100644 --- a/Application/Install/Controller/InstallController.class.php +++ b/Application/Install/Controller/InstallController.class.php @@ -16,7 +16,7 @@ class InstallController extends Controller{ protected function _initialize(){ if(Storage::has(MODULE_PATH . 'Data/install.lock')){ - $this->error('已经成功安装了Amango，请不要重复安装!'); + $this->error('已经成功安装了OneThink，请不要重复安装!'); } } From f8463db5a08a9c293083dc809c3820784deffdf2 Mon Sep 17 00:00:00 2001 From: wangke Date: Mon, 29 Dec 2014 21:50:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"Revert=20"=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=AE=8C=E5=96=84""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6867138f0a7435145962afb8cf38e403fc15ea4b. --- Application/Install/Controller/IndexController.class.php | 2 +- Application/Install/Controller/InstallController.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Install/Controller/IndexController.class.php b/Application/Install/Controller/IndexController.class.php index ed51296..5e224fe 100644 --- a/Application/Install/Controller/IndexController.class.php +++ b/Application/Install/Controller/IndexController.class.php @@ -42,7 +42,7 @@ public function complete(){ } // 写入安装锁定文件 - Storage::put(MODULE_PATH . 'Data/install.lock', 'lock'); + //Storage::put(MODULE_PATH . 'Data/install.lock', 'lock'); //创建配置文件 $this->assign('info',session('config_file')); diff --git a/Application/Install/Controller/InstallController.class.php b/Application/Install/Controller/InstallController.class.php index dacbc88..5702c30 100644 --- a/Application/Install/Controller/InstallController.class.php +++ b/Application/Install/Controller/InstallController.class.php @@ -16,7 +16,7 @@ class InstallController extends Controller{ protected function _initialize(){ if(Storage::has(MODULE_PATH . 'Data/install.lock')){ - $this->error('已经成功安装了OneThink，请不要重复安装!'); + $this->error('已经成功安装了Amango，请不要重复安装!'); } }