aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migration/data/v310
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-11-16 16:57:07 -0800
committerCesar G <prototech91@gmail.com>2014-11-16 17:01:03 -0800
commitfb34cbf7cde2e7413c0a45dc42e5014c82794b77 (patch)
tree72d79c4035b3b3eeef9c456fb8e899271b256c86 /phpBB/phpbb/db/migration/data/v310
parent4ffdb129388d72cdcc790f1c3713e3770d8aeca9 (diff)
downloadforums-fb34cbf7cde2e7413c0a45dc42e5014c82794b77.tar
forums-fb34cbf7cde2e7413c0a45dc42e5014c82794b77.tar.gz
forums-fb34cbf7cde2e7413c0a45dc42e5014c82794b77.tar.bz2
forums-fb34cbf7cde2e7413c0a45dc42e5014c82794b77.tar.xz
forums-fb34cbf7cde2e7413c0a45dc42e5014c82794b77.zip
[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
The Recaptcha plugin class name does not follow the phpbb_captcha_ prefix convention as all others. Instead it simply uses phpbb_, hence the check for its existence under phpbb/captcha/plugins/ fails. PHPBB3-13342
Diffstat (limited to 'phpBB/phpbb/db/migration/data/v310')
-rw-r--r--phpBB/phpbb/db/migration/data/v310/captcha_plugins.php8
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(