mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-03 13:51:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

去除 IS_CGI IS_MAC NOW_TIME 常量

Browse Source
This commit is contained in:
thinkphp
2016-06-02 12:21:36 +08:00
parent 8099a001e2
commit d65882e20c
7 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Model.php
View File

@@ -1017,16 +1017,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
switch ($type) {
case 'timestamp':
$format = !empty($param) ? $param : $this->dateFormat;
$value = date($format, NOW_TIME);
$value = date($format, $_SERVER['REQUEST_TIME']);
break;
case 'datetime':
$value = NOW_TIME;
$value = $_SERVER['REQUEST_TIME'];
break;
}
} elseif (isset($this->fieldType[$name]) && preg_match('/(datetime|timestamp)/is', $this->fieldType[$name])) {
$value = date($this->dateFormat, NOW_TIME);
$value = date($this->dateFormat, $_SERVER['REQUEST_TIME']);
} else {
$value = NOW_TIME;
$value = $_SERVER['REQUEST_TIME'];
}
} else {
// 检测修改器