aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/captcha
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-10-04 17:25:00 +0200
committerIgor Wiedler <igor@wiedler.ch>2010-10-04 17:25:00 +0200
commit798e62b7b0f66aa5161c77571d7f53676c675a5c (patch)
treef5ad768d692c2a9761d39e8de5726d9ae88b5cca /phpBB/includes/captcha
parentcdadda35540d4909a00de01c1671251684e2801f (diff)
parent8e7f2e179e14b42b5c17aba5fc87311294e61511 (diff)
downloadforums-798e62b7b0f66aa5161c77571d7f53676c675a5c.tar
forums-798e62b7b0f66aa5161c77571d7f53676c675a5c.tar.gz
forums-798e62b7b0f66aa5161c77571d7f53676c675a5c.tar.bz2
forums-798e62b7b0f66aa5161c77571d7f53676c675a5c.tar.xz
forums-798e62b7b0f66aa5161c77571d7f53676c675a5c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS [ticket/9829] Fix error in recaptcha validation.
Diffstat (limited to 'phpBB/includes/captcha')
-rw-r--r--phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index dad39867dc..35a33cdfb7 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -314,10 +314,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
}
else
{
- if ($answers[1] === 'incorrect-captcha-sol')
- {
- return $user->lang['RECAPTCHA_INCORRECT'];
- }
+ return $user->lang['RECAPTCHA_INCORRECT'];
}
}