diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-20 23:10:19 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-20 23:10:19 +0100 |
| commit | 3134b6b70e55e2f75f14c61b273e6c0673d0411d (patch) | |
| tree | 668d50fad00f5c5af748d25920a5477e9a4938b8 /phpBB/includes | |
| parent | 03e3ee7f163cc87cc9574320ecb2d6072027c9f6 (diff) | |
| parent | 6564446b0f14b88e540e2b1b5fe72fe4082d5573 (diff) | |
| download | forums-3134b6b70e55e2f75f14c61b273e6c0673d0411d.tar forums-3134b6b70e55e2f75f14c61b273e6c0673d0411d.tar.gz forums-3134b6b70e55e2f75f14c61b273e6c0673d0411d.tar.bz2 forums-3134b6b70e55e2f75f14c61b273e6c0673d0411d.tar.xz forums-3134b6b70e55e2f75f14c61b273e6c0673d0411d.zip | |
Merge pull request #3306 from marc1706/ticket/13519
[ticket/13519] Correctly validate imagick path as path and not string
* marc1706/ticket/13519:
[ticket/13519] Correctly validate imagick path as path and not string
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index fc5f44e14f..147783feae 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -127,7 +127,7 @@ class acp_attachments 'img_create_thumbnail' => array('lang' => 'CREATE_THUMBNAIL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'img_max_thumb_width' => array('lang' => 'MAX_THUMB_WIDTH', 'validate' => 'int', 'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'img_min_thumb_filesize' => array('lang' => 'MIN_THUMB_FILESIZE', 'validate' => 'int', 'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), - 'img_imagick' => array('lang' => 'IMAGICK_PATH', 'validate' => 'string', 'type' => 'text:20:200', 'explain' => true, 'append' => ' <span>[ <a href="' . $this->u_action . '&action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'), + 'img_imagick' => array('lang' => 'IMAGICK_PATH', 'validate' => 'path', 'type' => 'text:20:200', 'explain' => true, 'append' => ' <span>[ <a href="' . $this->u_action . '&action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'), 'img_max' => array('lang' => 'MAX_IMAGE_SIZE', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'img_link' => array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), ) |