diff options
| author | Cesar G <prototech91@gmail.com> | 2014-11-16 16:52:59 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-11-16 17:01:38 -0800 |
| commit | 7b33018ade25a6bb866b7746b9dcc7455a7304ab (patch) | |
| tree | 251983ef8c9ce26568f7bb74e1b236f74eb1b7aa /phpBB | |
| parent | 4ffdb129388d72cdcc790f1c3713e3770d8aeca9 (diff) | |
| download | forums-7b33018ade25a6bb866b7746b9dcc7455a7304ab.tar forums-7b33018ade25a6bb866b7746b9dcc7455a7304ab.tar.gz forums-7b33018ade25a6bb866b7746b9dcc7455a7304ab.tar.bz2 forums-7b33018ade25a6bb866b7746b9dcc7455a7304ab.tar.xz forums-7b33018ade25a6bb866b7746b9dcc7455a7304ab.zip | |
[ticket/13315] Fix loss of CAPTCHA plugin config value.
The plugins were moved to phpbb/captcha/plugins/ after this migration was
created, thus the check is no longer valid and ends up resetting the value
prematurely.
PHPBB3-13315
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/reset_missing_captcha_plugin.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/reset_missing_captcha_plugin.php b/phpBB/phpbb/db/migration/data/v310/reset_missing_captcha_plugin.php index d5f9076196..68d630b063 100644 --- a/phpBB/phpbb/db/migration/data/v310/reset_missing_captcha_plugin.php +++ b/phpBB/phpbb/db/migration/data/v310/reset_missing_captcha_plugin.php @@ -29,7 +29,8 @@ class reset_missing_captcha_plugin extends \phpbb\db\migration\migration { return array( array('if', array( - (!is_file($this->phpbb_root_path . "includes/captcha/plugins/{$this->config['captcha_plugin']}_plugin." . $this->php_ext)), + (!is_dir($this->phpbb_root_path . 'phpbb/captcha/plugins/') && + !is_file($this->phpbb_root_path . "includes/captcha/plugins/{$this->config['captcha_plugin']}_plugin." . $this->php_ext)), array('config.update', array('captcha_plugin', 'phpbb_captcha_nogd')), )), ); |