From a9f0fd0708db382fd79eaa2f965acf1a83601d83 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 May 2015 15:49:45 +0200
Subject: [PATCH] UserController: Ensure that the sort and dir parameters are
 being applied

refs #8826
---
 application/controllers/UserController.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 0f3a073a3..587bd4107 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -16,6 +16,7 @@ class UserController extends Controller
      */
     public function init()
     {
+        parent::init();
         $this->createTabs();
     }
 
@@ -79,12 +80,15 @@ class UserController extends Controller
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->users);
-        $this->setupSortControl(array(
-            'user_name'     => $this->translate('Username'),
-            'is_active'     => $this->translate('Active'),
-            'created_at'    => $this->translate('Created at'),
-            'last_modified' => $this->translate('Last modified')
-        ));
+        $this->setupSortControl(
+            array(
+                'user_name'     => $this->translate('Username'),
+                'is_active'     => $this->translate('Active'),
+                'created_at'    => $this->translate('Created at'),
+                'last_modified' => $this->translate('Last modified')
+            ),
+            $query
+        );
     }
 
     /**