Merges from upstream Kabuki.

This commit is contained in:
2017-11-05 16:27:12 +01:00
parent 31e1357b47
commit 1a15e347f2
6 changed files with 35 additions and 25 deletions

View File

@@ -19,6 +19,7 @@ class ManageErrors extends HTMLController
{
ErrorLog::flush();
header('Location: ' . BASEURL . '/manageerrors/');
exit;
}
Session::resetSessionToken();

View File

@@ -93,10 +93,10 @@ class ManageUsers extends HTMLController
'sort_direction' => !empty($_GET['dir']) ? $_GET['dir'] : '',
'title' => 'Manage users',
'no_items_label' => 'No users meet the requirements of the current filter.',
'items_per_page' => 15,
'items_per_page' => 30,
'index_class' => 'floatleft',
'base_url' => BASEURL . '/manageusers/',
'get_data' => function($offset = 0, $limit = 15, $order = '', $direction = 'down') {
'get_data' => function($offset = 0, $limit = 30, $order = '', $direction = 'down') {
if (!in_array($order, ['id_user', 'surname', 'first_name', 'slug', 'emailaddress', 'last_action_time', 'ip_address', 'is_admin']))
$order = 'id_user';