From 855124a514c84db1686d1dffcf52f4b00b1862ec Mon Sep 17 00:00:00 2001 From: thinkphp Date: Wed, 15 Feb 2017 08:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=88=86=E9=A1=B5=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Paginator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/think/Paginator.php b/library/think/Paginator.php index 0c1bea8a..d3547f8b 100644 --- a/library/think/Paginator.php +++ b/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(), ]; }