📦 更新thinkphp(v5.1.37.1)

2019-08-03 23:59:37 +08:00
parent 0330b3dc88
commit 4ccf046521
59 changed files with 1065 additions and 610 deletions
@@ -24,8 +24,10 @@ class Collection extends BaseCollection
     */
    public function load($relation)
    {
-        $item = current($this->items);
-        $item->eagerlyResultSet($this->items, $relation);
+        if (!$this->isEmpty()) {
+            $item = current($this->items);
+            $item->eagerlyResultSet($this->items, $relation);
+        }

        return $this;
    }