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

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2016-06-21 14:55:07 +08:00
parent 1cc1976eaa 97f08d4476
commit 4c24572871
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Model.php
View File

@@ -391,11 +391,13 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$value = date($format, strtotime($value));
break;
case 'json':
case 'array':
$value = json_decode($value, true);
break;
case 'array':
$value = is_null($value) ? [] : json_decode($value, true);
break;
case 'object':
$value = json_decode($value);
$value = empty($value) ? new \stdClass() : json_decode($value);
break;
case 'serialize':
$value = unserialize($value);