From d8e71d379063630a5f99cf63dd99f645fcd96fd4 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 2 Sep 2014 14:07:46 +0200 Subject: [PATCH] monitoring/list: ignore post in applyFilter refs #6644 --- .../application/controllers/ListController.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index bd380a787..b71d78acf 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -501,15 +501,8 @@ class Monitoring_ListController extends Controller $request = $this->getRequest(); $limit = $params->shift('limit'); - - $sort = null; - $dir = null; - if ($request->isPost()) { - $sort = $request->getPost('sort', null); - $dir = $request->getPost('dir', null); - } - $sort = $params->shift('sort', $sort); - $dir = $params->shift('dir', $dir); + $sort = $params->shift('sort'); + $dir = $params->shift('dir'); $page = $params->shift('page'); $format = $params->shift('format'); $view = $params->shift('view'); @@ -546,7 +539,9 @@ class Monitoring_ListController extends Controller $query->applyFilter($filter); } $this->view->filter = $filter; - $query->order($sort, $dir); + if ($sort) { + $query->order($sort, $dir); + } $this->applyRestrictions($query); $this->handleFormatRequest($query); return $query;