diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-01 18:02:38 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-01 18:02:38 -0500 |
| commit | 5debf22ba555b7970e6df5548118cd879d4c6a1f (patch) | |
| tree | 5d92b86e11e3aae354e9d12c61b31257640bd332 /phpBB/includes | |
| parent | 1bb8dad9410b3af21baf0f8d7fcd700da6f684fd (diff) | |
| parent | f0facd4c9df3a9f100ef8ae021485a203f86f774 (diff) | |
| download | forums-5debf22ba555b7970e6df5548118cd879d4c6a1f.tar forums-5debf22ba555b7970e6df5548118cd879d4c6a1f.tar.gz forums-5debf22ba555b7970e6df5548118cd879d4c6a1f.tar.bz2 forums-5debf22ba555b7970e6df5548118cd879d4c6a1f.tar.xz forums-5debf22ba555b7970e6df5548118cd879d4c6a1f.zip | |
Merge branch 'ticket/bantu/9766' into develop
* ticket/bantu/9766:
[ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/captcha/plugins/captcha_abstract.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 15 |
2 files changed, 0 insertions, 27 deletions
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 @@ -567,20 +566,6 @@ class phpbb_captcha_qa } /** - * 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 */ function get_attempt_count() |