aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/questionnaire/questionnaire.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-11-10 17:04:00 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-11-10 17:04:00 +0100
commit0dfbb60bc322ccda7a6e670a5f5ec9ab2f536eac (patch)
tree03a2df99a9f37139f5d530b68a7b125eacd281b6 /phpBB/includes/questionnaire/questionnaire.php
parent65226168ee2841dbe7f6934b16ff38f0a27ac09b (diff)
parentc0a26e3d57e69fb1dc436379b4e3609bc10f9194 (diff)
downloadforums-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/includes/questionnaire/questionnaire.php')
-rw-r--r--phpBB/includes/questionnaire/questionnaire.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index 5a27124bf9..2f80582918 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -369,7 +369,6 @@ class phpbb_questionnaire_phpbb_data_provider
'hot_threshold' => true,
'img_create_thumbnail' => true,
'img_display_inlined' => true,
- 'img_imagick' => true,
'img_link_height' => true,
'img_link_width' => true,
'img_max_height' => true,