diff options
author | Marc Alexander <admin@m-a-styles.de> | 2018-11-10 17:04:00 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2018-11-10 17:04:00 +0100 |
commit | 0dfbb60bc322ccda7a6e670a5f5ec9ab2f536eac (patch) | |
tree | 03a2df99a9f37139f5d530b68a7b125eacd281b6 /phpBB/install | |
parent | 65226168ee2841dbe7f6934b16ff38f0a27ac09b (diff) | |
parent | c0a26e3d57e69fb1dc436379b4e3609bc10f9194 (diff) | |
download | forums-0dfbb60bc322ccda7a6e670a5f5ec9ab2f536eac.tar forums-0dfbb60bc322ccda7a6e670a5f5ec9ab2f536eac.tar.gz forums-0dfbb60bc322ccda7a6e670a5f5ec9ab2f536eac.tar.bz2 forums-0dfbb60bc322ccda7a6e670a5f5ec9ab2f536eac.tar.xz forums-0dfbb60bc322ccda7a6e670a5f5ec9ab2f536eac.zip |
Merge pull request #42 from phpbb/ticket/security/227
[ticket/security/227] Replace ImageMagick support with thumbnail event
Diffstat (limited to 'phpBB/install')
-rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 1 | ||||
-rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 8b80eec4c8..2da901d3de 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1694,7 +1694,6 @@ function phpbb_import_attach_config() $config->set('img_create_thumbnail', $attach_config['img_create_thumbnail']); $config->set('img_max_thumb_width', 400); $config->set('img_min_thumb_filesize', $attach_config['img_min_thumb_filesize']); - $config->set('img_imagick', $attach_config['img_imagick']); } /** diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index c60fed602b..78e3b56e56 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -149,7 +149,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '2 INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_imagick', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_height', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_width', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_height', '0'); |