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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
This commit is contained in:
Tristan Darricau 2014-11-18 16:29:08 +01:00
commit 3b1c611566
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
View file

@ -25,9 +25,13 @@ class captcha_plugins extends \phpbb\db\migration\migration
public function update_data() public function update_data()
{ {
$captcha_plugin = $this->config['captcha_plugin']; $captcha_plugin = $this->config['captcha_plugin'];
if (strpos($this->config['captcha_plugin'], 'phpbb_captcha_') === 0) if (strpos($captcha_plugin, 'phpbb_captcha_') === 0)
{ {
$captcha_plugin = substr($this->config['captcha_plugin'], strlen('phpbb_captcha_')); $captcha_plugin = substr($captcha_plugin, strlen('phpbb_captcha_'));
}
else if (strpos($captcha_plugin, 'phpbb_') === 0)
{
$captcha_plugin = substr($captcha_plugin, strlen('phpbb_'));
} }
return array( return array(