aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2009-08-16 21:11:17 +0000
committerHenry Sudhof <kellanved@phpbb.com>2009-08-16 21:11:17 +0000
commitba3e0831ea90cdf2fa740088162e57221107748c (patch)
tree4502dc71fe40af1c41718dccca4b768f78a58d46
parent6cc55a3436ea81482d0d2462b400e2b66274660d (diff)
downloadforums-ba3e0831ea90cdf2fa740088162e57221107748c.tar
forums-ba3e0831ea90cdf2fa740088162e57221107748c.tar.gz
forums-ba3e0831ea90cdf2fa740088162e57221107748c.tar.bz2
forums-ba3e0831ea90cdf2fa740088162e57221107748c.tar.xz
forums-ba3e0831ea90cdf2fa740088162e57221107748c.zip
erm, on the contrary; can that reset call
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9998 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php2
-rw-r--r--phpBB/posting.php6
2 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 35f42848b3..511706bb93 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -354,7 +354,7 @@ class phpbb_captcha_qa
if (strlen($error))
{
// okay, incorrect answer. Let's ask a new question.
- // $this->new_attempt();
+ $this->new_attempt();
$this->solved = false;
return $error;
}
diff --git a/phpBB/posting.php b/phpBB/posting.php
index f53dc2bb75..ae614a36ef 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1121,11 +1121,6 @@ if ($submit || $preview || $refresh)
// The last parameter tells submit_post if search indexer has to be run
$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false);
- if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
- {
- $captcha->reset();
- }
-
// Check the permissions for post approval. Moderators are not affected.
if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']))
{
@@ -1369,7 +1364,6 @@ generate_forum_rules($post_data);
// Posting uses is_solved for legacy reasons. Plugins have to use is_solved to force themselves to be displayed.
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === false) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote'))
{
- $captcha->reset();
$template->assign_vars(array(
'S_CONFIRM_CODE' => true,