From 8b5ee4e688aeae1cdcb787e7014f3aa090061b29 Mon Sep 17 00:00:00 2001
From: liuzhaowei55 <liuzhaowei55@gmail.com>
Date: Wed, 16 Dec 2015 20:00:46 +0800
Subject: [PATCH] update thinkphp/library/think/model.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为$options设置默认值,当_read_datalist()函数调用时可以不传此参数,避免traits/model/Relation函数中的_after_select()和_after_find()重复执行
---
 library/think/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/model.php b/library/think/model.php
index ea5625a8..02637b61 100644
--- a/library/think/model.php
+++ b/library/think/model.php
@@ -677,7 +677,7 @@ class Model
      * @param array $data 当前数据
      * @return array
      */
-    protected function _read_data($data, $options)
+    protected function _read_data($data, $options = [])
     {
         // 检查字段映射
         if (!empty($this->map)) {