From 9bc86ecf0bd32ed2615023bcf9ae398aafbb23fa Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sat, 4 Dec 2021 17:29:59 +0100 Subject: [PATCH] Deselecting columns for the user result list was overridden by defaults See https://community.woltlab.com/thread/292760-acp-benutzersuche/ --- .../install/files/lib/acp/form/UserSearchForm.class.php | 8 ++++++-- .../install/files/lib/acp/page/UserListPage.class.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php index db671baa14..00f148fcd2 100755 --- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php @@ -140,8 +140,12 @@ class UserSearchForm extends UserOptionListForm if (isset($_POST['sortOrder'])) { $this->sortOrder = $_POST['sortOrder']; } - if (isset($_POST['columns']) && \is_array($_POST['columns'])) { - $this->columns = $_POST['columns']; + if (!empty($_POST)) { + if (isset($_POST['columns']) && \is_array($_POST['columns'])) { + $this->columns = $_POST['columns']; + } else { + $this->columns = []; + } } } diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php index 2fef97bcab..ff971e387e 100755 --- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php @@ -183,7 +183,7 @@ class UserListPage extends SortablePage parent::readData(); // add email column for authorized users - if (WCF::getSession()->getPermission('admin.user.canEditMailAddress')) { + if (!$this->searchID && WCF::getSession()->getPermission('admin.user.canEditMailAddress')) { \array_unshift($this->columns, 'email'); } -- 2.20.1