From fc62722ff9538fa8dd3a57ef2925bf767922821f Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Tue, 21 Aug 2012 08:00:17 +0000
Subject: [PATCH] Empty commit

---
 sections/login/index.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sections/login/index.php b/sections/login/index.php
index 25f9f9b9..7e8700c2 100644
--- a/sections/login/index.php
+++ b/sections/login/index.php
@@ -32,14 +32,15 @@
 		// User has entered a new password, use step 2
 		$DB->query("SELECT 
 			m.ID,
-			m.Email,
+            m.Email,
+            m.ipcc,
 			i.ResetExpires 
 			FROM users_main AS m 
 			INNER JOIN users_info AS i ON i.UserID=m.ID 
 			WHERE i.ResetKey='".db_string($_REQUEST['key'])."' 
 			AND i.ResetKey<>'' 
 			AND m.Enabled='1'");
-		list($UserID,$Email,$Expires)=$DB->next_record();
+		list($UserID,$Email,$Country,$Expires)=$DB->next_record();
 
 		if ($UserID && strtotime($Expires)>time()) {
 			// If the user has requested a password change, and his key has not expired
@@ -63,7 +64,8 @@
 						WHERE m.ID='".db_string($UserID)."' 
 						AND i.UserID=m.ID");
 					$Reset = true; // Past tense form of "to reset", meaning that password has now been reset
-				}
+                    
+                }
 			}
 			
 			// Either a form asking for them to enter the password