diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-18 15:11:14 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-18 15:11:14 +0100 |
| commit | 4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0 (patch) | |
| tree | 55102b3aeac13e7ee917ea845421d1717730e7e7 /phpBB/phpbb/db | |
| parent | 1e03dddcfe35d7174e69a8b350c63bc94dc1209e (diff) | |
| parent | 0019039bc105db52dbd3727a038b86797a15747c (diff) | |
| download | forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.tar forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.tar.gz forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.tar.bz2 forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.tar.xz forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13315] Check for the includes/captcha/plugins/ directory instead.
[ticket/13315] Fix loss of CAPTCHA plugin config value.
Diffstat (limited to 'phpBB/phpbb/db')
| -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..8211457dc6 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 . 'includes/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')), )), ); |