mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 07:32:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加view_filter行为标签

Browse Source
This commit is contained in:
thinkphp
2016-02-04 19:56:20 +08:00
parent 3fd22af62b
commit 13259ce755
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/View.php
View File

@@ -176,6 +176,8 @@ class View
} }
// 获取并清空缓存 // 获取并清空缓存
$content = ob_get_clean(); $content = ob_get_clean();
// 内容过滤标签
APP_HOOK && Hook::listen('view_filter', $content);
// 允许用户自定义模板的字符串替换 // 允许用户自定义模板的字符串替换
if (!empty($this->config['parse_str'])) { if (!empty($this->config['parse_str'])) {
$replace = $this->config['parse_str']; $replace = $this->config['parse_str'];

4
library/traits/model/Auto.php
View File

@@ -35,9 +35,9 @@ trait Auto
$this->error = Lang::get('_DATA_TYPE_INVALID_'); $this->error = Lang::get('_DATA_TYPE_INVALID_');
return false; return false;
} }
$pk = $this->getPk();
// 状态 // 状态
$type = $type ? $type : (!empty($data[$this->getPk()]) ? self::MODEL_UPDATE : self::MODEL_INSERT); $type = $type ? $type : (is_string($pk) && !empty($data[$pk]) ? self::MODEL_UPDATE : self::MODEL_INSERT);
$type = 1 << ($type - 1); $type = 1 << ($type - 1);
// 字段列表 // 字段列表
$keys = array_keys($data); $keys = array_keys($data);