1 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index e23cfd0de0..c6de2ff887 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -38,13 +38,12 @@ class phpbb_default_captcha
 		global $config, $db, $user;
 
 		// read input
-		$this->confirm_id = request_var('confirm_id', '');
 		$this->confirm_code = request_var('confirm_code', '');
 		$refresh = request_var('refresh_vc', false) && $config['confirm_refresh'];
 
 		$this->type = (int) $type;
 
-		if (!strlen($this->confirm_id) || !$this->load_code())
+		if (!$this->load_code())
 		{
 			// we have no confirm ID, better get ready to display something
 			$this->generate_code();
@@ -205,6 +204,7 @@ class phpbb_default_captcha
 		{
 			// okay, incorrect answer. Let's ask a new question.
 			$this->new_attempt();
+			$this->solved = false;
 			return $error;
 		}
 		else
@@ -277,7 +277,6 @@ class phpbb_default_captcha
 				'seed'			=> (int) $this->seed)) . '
 				, attempts = attempts + 1 
 				WHERE
-				confirm_id = \'' . $db->sql_escape($this->confirm_id) . '\' AND
 				session_id = \'' . $db->sql_escape($user->session_id) . '\'';
 		$db->sql_query($sql);
 	}
@@ -289,10 +288,9 @@ class phpbb_default_captcha
 	{
 		global $db, $user;
 
-		$sql = 'SELECT code, seed, attempts
+		$sql = 'SELECT code, confirm_id, seed, attempts
 			FROM ' . CONFIRM_TABLE . "
-			WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
-			AND session_id = '" . $db->sql_escape($user->session_id) . "'
+			WHERE session_id = '" . $db->sql_escape($user->session_id) . "'
 				AND confirm_type = " . $this->type;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
@@ -300,6 +298,7 @@ class phpbb_default_captcha
 
 		if ($row)
 		{
+			$this->confirm_id = $row['confirm_id'];
 			$this->code = $row['code'];
 			$this->seed = $row['seed'];
 			$this->attempts = $row['attempts'];