From 1a3bf05dfbff72a243224485a83926d046eb2375 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 27 Jul 2019 15:57:23 +0000 Subject: [PATCH] Changed "Contact::select" to "Contact::selectToArray" --- src/Model/Contact.php | 6 ++---- src/Module/Admin/Blocklist/Contact.php | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 398acc2d7d..f01cb73604 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -117,11 +117,9 @@ class Contact extends BaseObject * @return array * @throws \Exception */ - public static function select(array $fields = [], array $condition = [], array $params = []) + public static function selectToArray(array $fields = [], array $condition = [], array $params = []) { - $statement = DBA::select('contact', $fields, $condition, $params); - - return DBA::toArray($statement); + return DBA::selectToArray('contact', $fields, $condition, $params); } /** diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php index 60fe04bf7a..de3c717e37 100644 --- a/src/Module/Admin/Blocklist/Contact.php +++ b/src/Module/Admin/Blocklist/Contact.php @@ -53,7 +53,7 @@ class Contact extends BaseAdminModule $pager = new Pager($a->query_string, 30); - $contacts = Model\Contact::select([], $condition, ['limit' => [$pager->getStart(), $pager->getItemsPerPage()]]); + $contacts = Model\Contact::selectToArray([], $condition, ['limit' => [$pager->getStart(), $pager->getItemsPerPage()]]); $t = Renderer::getMarkupTemplate('admin/blocklist/contact.tpl'); $o = Renderer::replaceMacros($t, [