Merge pull request #7487 from Bakual/FixSmartSearchPagination

Pagination user manager when Search Tools present
joomla · Nov 4, 2015 · d8e4926 · d8e4926
2 parents 7abe00f + d667541
commit d8e4926
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/administrator/components/com_users/models/users.php b/administrator/components/com_users/models/users.php
@@ -80,7 +80,7 @@ protected function populateState($ordering = null, $direction = null)
 		$state = $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state');
 		$this->setState('filter.state', $state);
 
-		$groupId = $this->getUserStateFromRequest($this->context . '.filter.group', 'filter_group_id', null, 'int');
+		$groupId = $this->getUserStateFromRequest($this->context . '.filter.group_id', 'filter_group_id', null, 'int');
 		$this->setState('filter.group_id', $groupId);
 
 		$range = $this->getUserStateFromRequest($this->context . '.filter.range', 'filter_range');

diff --git a/libraries/legacy/model/list.php b/libraries/legacy/model/list.php
@@ -698,7 +698,7 @@ public function getUserStateFromRequest($key, $request, $default = null, $type =
 			$name    = substr($request, 7);
 			$filters = $app->input->get('filter', array(), 'array');
 
-			if (!empty($filters[$name]))
+			if (isset($filters[$name]) && $filters[$name] !== '')
 			{
 				$new_state = $filters[$name];
 			}