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

改进Model类的JSON类型转换 支持非数组类型

Browse Source
This commit is contained in:
thinkphp
2016-06-07 11:38:30 +08:00
parent 71bcc1bb7b
commit 5988f36102
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Model.php
View File

@@ -321,11 +321,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$value = json_encode($value, JSON_FORCE_OBJECT); $value = json_encode($value, JSON_FORCE_OBJECT);
} }
break; break;
case 'json':
case 'array': case 'array':
if (is_array($value)) { $value = (array) $value;
$value = json_encode($value, JSON_UNESCAPED_UNICODE); case 'json':
} $value = json_encode($value, JSON_UNESCAPED_UNICODE);
break; break;
} }
return $value; return $value;