内核更新

2017-03-16 12:03:34 +08:00
parent b355535009
commit a4d58f9f09
28 changed files with 438 additions and 217 deletions
--- a/core/library/think/Paginator.php
+++ b/core/library/think/Paginator.php
@@ -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(),
        ];
    }