makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
  [ticket/9829] Fix error in recaptcha validation.
This commit is contained in:
Igor Wiedler 2010-10-04 17:25:00 +02:00
commit 798e62b7b0
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/docs/AUTHORS
View file

@ -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)

5
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View file

@ -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'];
}
}