1、bug的修复

2、内核更新
2016-07-10 23:48:24 +08:00
parent f3fff63632
commit 1a0a29413a
50 changed files with 760 additions and 958 deletions
--- a/application/admin/controller/Action.php
+++ b/application/admin/controller/Action.php
@@ -140,9 +140,9 @@ class Action extends Admin {
 		$result = db('Action')->where($map)->setField('status',$status);
 		if ($result !== false) {
 			action_log('setstatus_action', 'Action', $id, session('user_auth.uid'));
-			return $this->success('设置'.$message.'状态成功！','');
+			return $this->success('设置'.$message.'状态成功！');
 		}else{
-			return $this->error('设置'.$message.'状态失败！','');
+			return $this->error('设置'.$message.'状态失败！');
 		}
 	}