diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-18 16:29:08 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-18 16:29:08 +0100 |
| commit | 3b1c611566399c1e06bd737ec283b141e3c410f5 (patch) | |
| tree | e7ba53acd23018f9d60857f84bc247fee368cf12 /phpBB/phpbb | |
| parent | 4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0 (diff) | |
| parent | acfe6dd37d58e35566f4c386c0e15b2a447d5ad4 (diff) | |
| download | forums-3b1c611566399c1e06bd737ec283b141e3c410f5.tar forums-3b1c611566399c1e06bd737ec283b141e3c410f5.tar.gz forums-3b1c611566399c1e06bd737ec283b141e3c410f5.tar.bz2 forums-3b1c611566399c1e06bd737ec283b141e3c410f5.tar.xz forums-3b1c611566399c1e06bd737ec283b141e3c410f5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/captcha_plugins.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php index 13071e9891..328c08f1ec 100644 --- a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php +++ b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php @@ -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( |