mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-14 19:45:21 +02:00
Code Issues Releases Wiki Activity

Okay it should work again. Thanks Raimon. In the future, please test if your changes are really a good idea.

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9694 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2009-06-26 20:18:05 +00:00
parent 31968a5070
commit d61574a61e
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/includes/ucp/ucp_register.php
View File

@ -77,19 +77,6 @@ class ucp_register
} }
} }
$vc_response = false;
if ($config['enable_confirm'])
{
include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_REG);
// If confirm id is submitted we check the status of the captcha here
if (request_var('confirm_code', ''))
{
$vc_response = $captcha->validate();
}
}
$cp = new custom_profile(); $cp = new custom_profile();
@ -172,6 +159,15 @@ class ucp_register
return; return;
} }
// The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
if ($config['enable_confirm'])
{
include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_REG);
}
// Try to manually determine the timezone and adjust the dst if the server date/time complies with the default setting +/- 1 // Try to manually determine the timezone and adjust the dst if the server date/time complies with the default setting +/- 1
$timezone = date('Z') / 3600; $timezone = date('Z') / 3600;
$is_dst = date('I'); $is_dst = date('I');
@ -230,7 +226,8 @@ class ucp_register
if ($config['enable_confirm']) if ($config['enable_confirm'])
{ {
if (!$captcha->is_solved()) $vc_response = $captcha->validate();
if (!$captcha->is_solved() && $vc_response)
{ {
$error[] = $vc_response; $error[] = $vc_response;
} }