# HG changeset patch
# User Dan
# Date 1261181838 18000
# Node ID 5c98b9f181f0889d3e1d8931ceaf970525563a65
# Parent  1e2c9819ede3b88b1570ab2f4c2970d9f3d96e8d
AJAX login: Fixed error box failure to destroy upon cancel. Fixes issue 8.

diff -r 1e2c9819ede3 -r 5c98b9f181f0 includes/clientside/static/login.js
--- a/includes/clientside/static/login.js	Fri Dec 18 19:06:49 2009 -0500
+++ b/includes/clientside/static/login.js	Fri Dec 18 19:17:18 2009 -0500
@@ -121,7 +121,7 @@
   logindata.mb_object.onclick['Cancel'] = function()
   {
     // Hide the error message, if any
-    $('ajax_login_error_box').remove();
+    $('#ajax_login_error_box').remove();
     // Hide the captcha, if any
     if ( document.getElementById('autoCaptcha') )
     {
diff -r 1e2c9819ede3 -r 5c98b9f181f0 includes/sessions.php
--- a/includes/sessions.php	Fri Dec 18 19:06:49 2009 -0500
+++ b/includes/sessions.php	Fri Dec 18 19:17:18 2009 -0500
@@ -866,7 +866,7 @@
       {
         $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
         // increment fail count
-        $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\', \'' . $db->escape($username) . '\');');
+        $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action, username) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\', \'' . $db->escape($username) . '\');');
       }
         
       return array(