From f0facd4c9df3a9f100ef8ae021485a203f86f774 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 1 Mar 2011 23:21:48 +0100
Subject: [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never
 called.

Delete phpbb_default_captcha:delete_code() and phpbb_captcha_qa::delete_code()
methods. We never call it and it has a bogus body.

PHPBB3-9766
---
 phpBB/includes/captcha/plugins/captcha_abstract.php       | 12 ------------
 .../includes/captcha/plugins/phpbb_captcha_qa_plugin.php  | 15 ---------------
 2 files changed, 27 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index c0b22e5192..aea39b3123 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -207,7 +207,6 @@ class phpbb_default_captcha
 		{
 			if ($this->check_code())
 			{
-				// $this->delete_code(); commented out to allow posting.php to repeat the question
 				$this->solved = true;
 			}
 			else
@@ -329,17 +328,6 @@ class phpbb_default_captcha
 		return (strcasecmp($this->code, $this->confirm_code) === 0);
 	}
 
-	function delete_code()
-	{
-		global $db, $user;
-
-		$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
-			WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
-				AND session_id = '" . $db->sql_escape($user->session_id) . "'
-				AND confirm_type = " . $this->type;
-		$db->sql_query($sql);
-	}
-
 	function get_attempt_count()
 	{
 		return $this->attempts;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 14dce3cbe3..75fef25a9f 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -379,7 +379,6 @@ class phpbb_captcha_qa
 		{
 			if ($this->check_answer())
 			{
-				// $this->delete_code(); commented out to allow posting.php to repeat the question
 				$this->solved = true;
 			}
 			else
@@ -566,20 +565,6 @@ class phpbb_captcha_qa
 		return $this->solved;
 	}
 
-	/**
-	*  API function - clean the entry
-	*/
-	function delete_code()
-	{
-		global $db, $user;
-
-		$sql = 'DELETE FROM ' . CAPTCHA_QA_CONFIRM_TABLE . "
-			WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
-				AND session_id = '" . $db->sql_escape($user->session_id) . "'
-				AND confirm_type = " . $this->type;
-		$db->sql_query($sql);
-	}
-
 	/**
 	*  API function
 	*/
-- 
cgit v1.2.1