From f49ebcdc1dd87cf68a16120de7e2044d884734c4 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 16 Jan 2017 11:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4loadRelation=20=3D>=20load=5Frelation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helper.php b/helper.php
index f26400c3..e8af0a52 100644
--- a/helper.php
+++ b/helper.php
@@ -549,14 +549,14 @@ if (!function_exists('token')) {
     }
 }
 
-if (!function_exists('loadRelation')) {
+if (!function_exists('load_relation')) {
     /**
      * 延迟预载入关联查询
      * @param mixed $resultSet 数据集
      * @param mixed $relation 关联
      * @return array
      */
-    function loadRelation($resultSet, $relation)
+    function load_relation($resultSet, $relation)
     {
         $item = current($resultSet);
         if ($item instanceof Model) {