Merge pull request #148 from WeakSun/patch-2

读取时增加空检测，防止数据为空导致调用异常
2026-07-01 12:42:48 +08:00 · 2016-06-21 14:49:29 +08:00
parent 02a99d13d7 7ff8b7bb57
commit 97f08d4476
1 changed files with 4 additions and 2 deletions
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -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);