Index: trunk/admin/users/user_list.php
===================================================================
diff -u -r13 -r137
--- trunk/admin/users/user_list.php	(.../user_list.php)	(revision 13)
+++ trunk/admin/users/user_list.php	(.../user_list.php)	(revision 137)
@@ -266,13 +266,18 @@
     $page = $objSession->GetVariable($CurrentPageVar);
   }
 }
-$sql .=" ".GetLimitSQL($page,(int)$objConfig->Get($PerPageVar));
+//$sql .=" ".GetLimitSQL($page,(int)$objConfig->Get($PerPageVar));
 
 if($objSession->HasSystemPermission("DEBUG.LIST"))
    echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
-//echo "SQL: $sql<br>";
-$objUsers->Query_Item($sql);
+$objListView = new clsListView($objListToolBar);
+$objListView->CurrentPageVar = $CurrentPageVar;
+$objListView->PerPageVar = $PerPageVar;
+   //echo "SQL: $sql<br>";
 
+$objUsers->Query_Item($sql, false, 'set_first');
+$objSession->SetVariable($CurrentPageVar, 1);
+
 $itemcount = QueryCount($sql);
 //$title = prompt_language("la_Text_ShowingUsers")." (".$objUsers->NumItems().")";
 //removed by PSK 2004-10-21
@@ -283,9 +288,9 @@
 else
   $title = prompt_language("la_Text_ShowingUsers")." (".$itemcount.")";
   
-  
+ $objListView->SetListItems($objUsers); 
 /* ---------------------------------------- Configure the list view ---------------------------------------- */
-$objListView = new clsListView($objListToolBar,$objUsers);
+
 $objListView->IdField = "ResourceId";
 $objListView->PageLinkTemplate = $pathtoroot.$admin."/templates/user_page_link.tpl";
 
@@ -302,8 +307,6 @@
 $objListView->SearchBar = TRUE;
 $objListView->SearchKeywords = $SearchWords;
 $objListView->SearchAction="m_user_search";
-$objListView->CurrentPageVar = $CurrentPageVar;
-$objListView->PerPageVar = $PerPageVar;
 $objListView->CheckboxName = "itemlist[]";
 $objListView->TotalItemCount = $itemcount;