From 5e848dad33dcbfb463c29ffea5d4982c3d3c23a0 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 23 Oct 2022 18:44:50 +0200 Subject: [PATCH 1/2] Deprecated message in libraries/src/MVC/Model/ListModel.php --- libraries/src/MVC/Model/ListModel.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php index 03b94d0d93c0c..a676241bd6fce 100644 --- a/libraries/src/MVC/Model/ListModel.php +++ b/libraries/src/MVC/Model/ListModel.php @@ -534,13 +534,15 @@ protected function populateState($ordering = null, $direction = null) break; case 'ordering': + if (!\in_array($value, $this->filter_fields)) { $value = $ordering; } break; case 'direction': - if (!\in_array(strtoupper($value), array('ASC', 'DESC', ''))) { + + if ($value && (!\in_array(strtoupper($value), array('ASC', 'DESC', '')))) { $value = $direction; } break; From bb1ffffd9e519de611c6007690c63a42988571b4 Mon Sep 17 00:00:00 2001 From: Martin Kopp Date: Sun, 23 Oct 2022 19:01:08 +0200 Subject: [PATCH 2/2] Code style --- libraries/src/MVC/Model/ListModel.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php index a676241bd6fce..8020b933118dc 100644 --- a/libraries/src/MVC/Model/ListModel.php +++ b/libraries/src/MVC/Model/ListModel.php @@ -534,14 +534,12 @@ protected function populateState($ordering = null, $direction = null) break; case 'ordering': - if (!\in_array($value, $this->filter_fields)) { $value = $ordering; } break; case 'direction': - if ($value && (!\in_array(strtoupper($value), array('ASC', 'DESC', '')))) { $value = $direction; }