diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-11 12:23:21 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-11 12:23:21 +0200 |
| commit | f09db1a7b4d9172035a461e90ce6fa3d7b544df3 (patch) | |
| tree | 77aa906455cf020db4e2bec413c56caaec45b8c6 /phpBB/phpbb/db | |
| parent | 7b35bd3e7cb7e18da6aae39807880731c820b0cf (diff) | |
| parent | 91df95a90dd3266f4beeb7df7534f75882909581 (diff) | |
| download | forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.tar forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.tar.gz forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.tar.bz2 forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.tar.xz forums-f09db1a7b4d9172035a461e90ce6fa3d7b544df3.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/captcha_plugins.php | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php new file mode 100644 index 0000000000..13071e9891 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php @@ -0,0 +1,44 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v310; + +class captcha_plugins extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\rc2', + ); + } + + public function update_data() + { + $captcha_plugin = $this->config['captcha_plugin']; + if (strpos($this->config['captcha_plugin'], 'phpbb_captcha_') === 0) + { + $captcha_plugin = substr($this->config['captcha_plugin'], strlen('phpbb_captcha_')); + } + + return array( + array('if', array( + (is_file($this->phpbb_root_path . 'phpbb/captcha/plugins/' . $captcha_plugin . '.' . $this->php_ext)), + array('config.update', array('captcha_plugin', 'core.captcha.plugins.' . $captcha_plugin)), + )), + array('if', array( + (!is_file($this->phpbb_root_path . 'phpbb/captcha/plugins/' . $captcha_plugin . '.' . $this->php_ext)), + array('config.update', array('captcha_plugin', 'core.captcha.plugins.nogd')), + )), + ); + } +} |