diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-10-04 17:25:00 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-10-04 17:25:00 +0200 |
| commit | 798e62b7b0f66aa5161c77571d7f53676c675a5c (patch) | |
| tree | f5ad768d692c2a9761d39e8de5726d9ae88b5cca | |
| parent | cdadda35540d4909a00de01c1671251684e2801f (diff) | |
| parent | 8e7f2e179e14b42b5c17aba5fc87311294e61511 (diff) | |
| download | forums-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.
| -rw-r--r-- | phpBB/docs/AUTHORS | 2 | ||||
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index d6af9d1db9..b3166313c3 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -27,7 +27,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) APTX (Marek A. R.) bantu (Andreas Fischer) dhn (Dominik Dröscher) - evil<3 (Igor Wiedler) + igorw (Igor Wiedler) kellanved (Henry Sudhof) nickvergessen (Joas Schilling) rxu (Ruslan Uzdenov) 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']; } } |