Merge pull request #3149 from prototech/ticket/13342

[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha

* prototech/ticket/13342:
  [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
This commit is contained in:
Tristan Darricau 2014-11-18 16:28:59 +01:00
commit acfe6dd37d

View file

@ -25,9 +25,13 @@ class captcha_plugins extends \phpbb\db\migration\migration
public function update_data()
{
$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(