From 0dc706b82cda137a5852a7f676cdf52f1ff6813b Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 13 Dec 2015 10:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=96=B9=E6=B3=95=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model.php           | 14 +++++++-------
 library/traits/model/relation.php | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/library/think/model.php b/library/think/model.php
index 62154311..f45a60b8 100644
--- a/library/think/model.php
+++ b/library/think/model.php
@@ -235,10 +235,10 @@ class Model
         return $result;
     }
     // 插入数据前的回调方法
-    protected function _before_insert(&$data, $options)
+    protected function _before_insert(&$data, $options = [])
     {}
     // 插入成功后的回调方法
-    protected function _after_insert($data, $options)
+    protected function _after_insert($data, $options = [])
     {}
 
     public function addAll($dataList, $options = [], $replace = false)
@@ -336,10 +336,10 @@ class Model
         return $result;
     }
     // 更新数据前的回调方法
-    protected function _before_update(&$data, $options)
+    protected function _before_update(&$data, $options = [])
     {}
     // 更新成功后的回调方法
-    protected function _after_update($data, $options)
+    protected function _after_update($data, $options = [])
     {}
 
     /**
@@ -409,7 +409,7 @@ class Model
         return $result;
     }
     // 删除成功后的回调方法
-    protected function _after_delete($data, $options)
+    protected function _after_delete($data, $options = [])
     {}
 
     /**
@@ -512,7 +512,7 @@ class Model
         return $resultSet;
     }
     // 查询成功后的回调方法
-    protected function _after_select(&$resultSet)
+    protected function _after_select(&$resultSet, $options = [])
     {}
 
     /**
@@ -689,7 +689,7 @@ class Model
         return $data;
     }
     // 数据读取成功后的回调方法
-    protected function _after_find(&$result)
+    protected function _after_find(&$result, $options = [])
     {}
 
     /**
diff --git a/library/traits/model/relation.php b/library/traits/model/relation.php
index 0c9ee72d..9bfa4f57 100644
--- a/library/traits/model/relation.php
+++ b/library/traits/model/relation.php
@@ -35,7 +35,7 @@ trait Relation
     }
 
     // 查询成功后的回调方法
-    protected function _after_find(&$result, $options)
+    protected function _after_find(&$result, $options = [])
     {
         // 获取关联数据 并附加到结果中
         if (!empty($options['link'])) {
@@ -45,7 +45,7 @@ trait Relation
     }
 
     // 查询数据集成功后的回调方法
-    protected function _after_select(&$result, $options)
+    protected function _after_select(&$result, $options = [])
     {
         // 获取关联数据 并附加到结果中
         if (!empty($options['link'])) {
@@ -55,7 +55,7 @@ trait Relation
     }
 
     // 写入成功后的回调方法
-    protected function _after_insert($data, $options)
+    protected function _after_insert($data, $options = [])
     {
         // 关联写入
         if (!empty($options['link'])) {
@@ -65,7 +65,7 @@ trait Relation
     }
 
     // 更新成功后的回调方法
-    protected function _after_update($data, $options)
+    protected function _after_update($data, $options = [])
     {
         // 关联更新
         if (!empty($options['link'])) {
@@ -75,7 +75,7 @@ trait Relation
     }
 
     // 删除成功后的回调方法
-    protected function _after_delete($data, $options)
+    protected function _after_delete($data, $options = [])
     {
         // 关联删除
         if (!empty($options['link'])) {