clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename method name

This commit is contained in:
nupplaPhil 2020-02-29 17:04:56 +01:00
parent ed422be734
commit 811f075aa1
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Console/User.php
View File

@ -352,7 +352,7 @@ HELP;
case 'active': case 'active':
case 'removed': case 'removed':
$table->setHeaders(['Nick', 'Name', 'URL', 'E-Mail', 'Register', 'Login', 'Last Item']); $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) { foreach ($contacts as $contact) {
$table->addRow([ $table->addRow([
$contact['nick'], $contact['nick'],

2
src/Model/User.php
View File

@ -1330,7 +1330,7 @@ class User
* @return array The list of the users * @return array The list of the users
* @throws Exception * @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 = '`' . str_replace('.', '`.`', $order) . '`';
$sql_order_direction = ($order_direction === '+') ? 'ASC' : 'DESC'; $sql_order_direction = ($order_direction === '+') ? 'ASC' : 'DESC';

2
src/Module/Admin/Users.php
View File

@ -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'))); $adminlist = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
$_setup_users = function ($e) use ($adminlist) { $_setup_users = function ($e) use ($adminlist) {