From d76ebc7c0637e449fc6833f68c0bbc37a530cad0 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Wed, 20 Nov 2019 13:08:36 +0100 Subject: [PATCH] fix sort-ordering parameter for pagination Signed-off-by: Michael Kaufmann --- lib/Froxlor/UI/Pagination.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/UI/Pagination.php b/lib/Froxlor/UI/Pagination.php index eb5a3717..107d38d6 100644 --- a/lib/Froxlor/UI/Pagination.php +++ b/lib/Froxlor/UI/Pagination.php @@ -82,7 +82,8 @@ class Pagination // add default ordering by given fields if (count($fields) > 0) { $orderfields = array_keys($fields); - $this->addOrderBy($orderfields[0]); + $this->sortfield = $orderfields[0]; + $this->addOrderBy($orderfields[0], $this->sortorder); } } @@ -287,8 +288,8 @@ class Pagination // check for possible sorting values and keep it $orderstr = ''; - foreach ($this->fields as $fieldname => $fieldcaption) { - $fieldname = htmlspecialchars($fieldname); + if (!empty($this->sortfield)) { + $fieldname = htmlspecialchars($this->sortfield); $orderstr .= '&sortfield=' . $fieldname . '&sortorder=' . $this->sortorder; }