更新tp5内核

core/library/think/model/Pivot.php

@@ -2,7 +2,7 @@
 // +----------------------------------------------------------------------
 // | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -24,11 +24,11 @@ class Pivot extends Model
     /**
      * 架构函数
      * @access public
-     * @param Model         $parent 上级模型
      * @param array|object  $data 数据
+     * @param Model         $parent 上级模型
      * @param string        $table 中间数据表名
      */
-    public function __construct(Model $parent, $data = [], $table = '')
+    public function __construct($data = [], Model $parent = null, $table = '')
     {
         $this->parent = $parent;
 
@@ -37,8 +37,6 @@ class Pivot extends Model
         }
 
         parent::__construct($data);
-
-        $this->class = $this->name;
     }
 
 }