mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 15:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206 from lilwil/master

Browse Source 
修复
This commit is contained in:
ThinkPHP
2016-07-09 19:49:55 -05:00
committed by GitHub
parent ea1b88af50 3a18b520d6
commit 6c99692e32
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/paginator/Collection.php
View File

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