Index: trunk/admin/users/user_list.php
===================================================================
diff -u -r603 -r822
--- trunk/admin/users/user_list.php	(.../user_list.php)	(revision 603)
+++ trunk/admin/users/user_list.php	(.../user_list.php)	(revision 822)
@@ -266,6 +266,8 @@
 }
 //$sql .=" ".GetLimitSQL($page,(int)$objConfig->Get($PerPageVar));
 
+$objSession->SetVariable("HasChanges", 0);
+
 if($objSession->HasSystemPermission("DEBUG.LIST"))
    echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
 $objListView = new clsListView($objListToolBar);
@@ -323,9 +325,27 @@
 }
 $objListToolBar->AddToInitScript("fwLoadMenus();");
 
+$filter = false; // always initialize variables before use
+if($objSession->GetVariable("UserSearchWord") != '') {
+	$filter = true;
+} 
+else {
+	if ($UserView != $Bit_All) {
+		$filter = true;
+	}
+}
+
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
 int_header($objListToolBar,NULL, $title,NULL,$h);
-?>
+if ($filter) { ?>
+<table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolbar">
+  <tr>
+    <td valign="top">
+      <?php int_hint_red(admin_language("la_Warning_Filter")); ?>
+    </td>
+  </tr>
+</table>
+<?php } ?>
 <FORM method="POST" ACTION="" NAME="userlistform" ID="userlistform">
 <?php
   print $objListView->PrintList();