Merge pull request #206 from lilwil/master

修复
2026-07-01 20:52:48 +08:00 · 2016-07-09 19:49:55 -05:00
parent ea1b88af50 3a18b520d6
commit 6c99692e32
1 changed files with 3 additions and 3 deletions
--- a/library/think/paginator/Collection.php
+++ b/library/think/paginator/Collection.php
@@ -51,7 +51,7 @@ class Collection extends \think\Collection
        return $this->paginator;
    }

-    public function toArray()
+    public function toArray($allow = [])
    {
        if ($this->paginator) {
            try {
@@ -64,10 +64,10 @@ class Collection extends \think\Collection
                'total'        => $total,
                'per_page'     => $this->listRows(),
                'current_page' => $this->currentPage(),
-                'data'         => parent::toArray()
+                'data'         => parent::toArray($allow)
            ];
        } else {
-            return parent::toArray();
+            return parent::toArray($allow);
        }
    }