From 13b345c889daa39649fef13d9006411e9d988387 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Sat, 24 Sep 2016 17:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=99=A8=E5=80=BC=E4=B8=BAnull=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E4=B8=8D=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Model.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/library/think/Model.php b/library/think/Model.php index fd3f4ead..6ac90cc8 100644 --- a/library/think/Model.php +++ b/library/think/Model.php @@ -442,12 +442,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess $value = (bool) $value; break; case 'timestamp': - $format = !empty($param) ? $param : $this->dateFormat; - $value = date($format, $value); + if (!is_null($value)) { + $format = !empty($param) ? $param : $this->dateFormat; + $value = date($format, $value); + } break; case 'datetime': - $format = !empty($param) ? $param : $this->dateFormat; - $value = date($format, strtotime($value)); + if (!is_null($value)) { + $format = !empty($param) ? $param : $this->dateFormat; + $value = date($format, strtotime($value)); + } break; case 'json': $value = json_decode($value, true);