# HG changeset patch
# User Dan
# Date 1280515187 14400
# Node ID e15d38ae8623632baaf4045b0ba30575a448ff0a
# Parent  673a1b6712fa3c13385d9871634d70cf35d53b83
Lockouts were displaying separately when they should have been displayed together (incorrect grouping). Possibly breaks Postgres - needs re-test in that environment

diff -r 673a1b6712fa -r e15d38ae8623 plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Fri Jul 30 14:39:04 2010 -0400
+++ b/plugins/admin/UserManager.php	Fri Jul 30 14:39:47 2010 -0400
@@ -1267,7 +1267,7 @@
 	}
 	
 	$q = $db->sql_query('SELECT COUNT(id) AS fail_count, ipaddr, username, timestamp FROM ' . table_prefix . "lockout AS l\n"
-								. "  WHERE timestamp > ( " . time() . " - " . intval(getConfig('lockout_duration', 15)) . "*60 ) GROUP BY ipaddr, username, timestamp ORDER BY COUNT(id) DESC, timestamp DESC;");
+								. "  WHERE timestamp > ( " . time() . " - " . intval(getConfig('lockout_duration', 15)) . "*60 ) GROUP BY ipaddr ORDER BY COUNT(id) DESC, timestamp DESC;");
 	if ( !$q )
 		$db->_die();