aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerky <derky@phpbb.com>2018-10-23 23:51:55 +0200
committerDerky <derky@phpbb.com>2018-10-23 23:57:24 +0200
commitd753351edc04a45c61411ee09607fb932d314617 (patch)
tree786d721e1cfac4866705114494982a2e45bcd467 /phpBB/install
parentMerge pull request #5423 from kasimi/ticket/15852 (diff)
downloadphpbb-d753351edc04a45c61411ee09607fb932d314617.tar.gz
phpbb-d753351edc04a45c61411ee09607fb932d314617.tar.bz2
phpbb-d753351edc04a45c61411ee09607fb932d314617.zip
[ticket/security/227] Replace ImageMagick support with thumbnail event
SECURITY-227
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/convertors/functions_phpbb20.php1
-rw-r--r--phpBB/install/schemas/schema_data.sql1
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 21f26b5f08..0027119bfe 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');