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/install | |
| 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/install')
| -rw-r--r-- | phpBB/install/install_install.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index b82df84a00..20b211dde9 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1382,7 +1382,7 @@ class install_install extends module if (@extension_loaded('gd')) { $sql_ary[] = 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = 'phpbb_captcha_gd' + SET config_value = 'core.captcha.plugins.gd' WHERE config_name = 'captcha_plugin'"; $sql_ary[] = 'UPDATE ' . $data['table_prefix'] . "config diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9cc151f728..5589e10243 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -70,7 +70,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1 INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval', '10'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type', 'd'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'phpbb_captcha_nogd'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'core.captcha.plugins.nogd'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_foreground_noise', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_x_grid', '25'); |