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

改进分页类

Browse Source
This commit is contained in:
thinkphp
2017-02-15 08:49:22 +08:00
parent c917ad1ce9
commit 855124a514
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Paginator.php
View File

@@ -341,7 +341,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
{
try {
$total = $this->total();
} catch (Exception $e) {
} catch (\DomainException $e) {
$total = null;
}
@@ -349,7 +349,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
'total' => $total,
'per_page' => $this->listRows(),
'current_page' => $this->currentPage(),
'data' => $this->items->toArray()
'data' => $this->items->toArray(),
];
}