From 811f075aa1857a28ea78d0406d2aa7355dd66608 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 29 Feb 2020 17:04:56 +0100 Subject: [PATCH] Rename method name --- src/Console/User.php | 2 +- src/Model/User.php | 2 +- src/Module/Admin/Users.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Console/User.php b/src/Console/User.php index ab6b9623c..b12a3a6ad 100644 --- a/src/Console/User.php +++ b/src/Console/User.php @@ -352,7 +352,7 @@ HELP; case 'active': case 'removed': $table->setHeaders(['Nick', 'Name', 'URL', 'E-Mail', 'Register', 'Login', 'Last Item']); - $contacts = UserModel::getUsers($start, $count, $subCmd); + $contacts = UserModel::getList($start, $count, $subCmd); foreach ($contacts as $contact) { $table->addRow([ $contact['nick'], diff --git a/src/Model/User.php b/src/Model/User.php index c0b9f71c0..351982e8a 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -1330,7 +1330,7 @@ class User * @return array The list of the users * @throws Exception */ - public static function getUsers($start = 0, $count = Pager::ITEMS_PER_PAGE, $type = 'all', $order = 'contact.name', $order_direction = '+') + public static function getList($start = 0, $count = Pager::ITEMS_PER_PAGE, $type = 'all', $order = 'contact.name', $order_direction = '+') { $sql_order = '`' . str_replace('.', '`.`', $order) . '`'; $sql_order_direction = ($order_direction === '+') ? 'ASC' : 'DESC'; diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php index 6064892f5..3ef91aadf 100644 --- a/src/Module/Admin/Users.php +++ b/src/Module/Admin/Users.php @@ -179,7 +179,7 @@ class Users extends BaseAdmin } } - $users = User::getUsers($pager->getStart(), $pager->getItemsPerPage(), 'all', $order, $order_direction); + $users = User::getList($pager->getStart(), $pager->getItemsPerPage(), 'all', $order, $order_direction); $adminlist = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email'))); $_setup_users = function ($e) use ($adminlist) {