diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-03-29 19:41:13 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-03-29 19:41:13 +0200 |
| commit | b9db47e3f52a8723b06e01f15c6e44052c014c42 (patch) | |
| tree | a95b627f257c1682c211acdb861a6aa27a75a809 /phpBB/includes/acp | |
| parent | 1efbb5b3bbd8c0b38c0f265453514dfd87ef04f0 (diff) | |
| parent | 7c5d872344a59f0fe2323d34885e543a09111ca7 (diff) | |
| download | forums-b9db47e3f52a8723b06e01f15c6e44052c014c42.tar forums-b9db47e3f52a8723b06e01f15c6e44052c014c42.tar.gz forums-b9db47e3f52a8723b06e01f15c6e44052c014c42.tar.bz2 forums-b9db47e3f52a8723b06e01f15c6e44052c014c42.tar.xz forums-b9db47e3f52a8723b06e01f15c6e44052c014c42.zip | |
Merge pull request #3359 from marc1706/ticket/13568
[ticket/13568] Validate imagick path as readable absolute path
closes #3359
Diffstat (limited to 'phpBB/includes/acp')
| -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 147783feae..bffe6f7db3 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' => 'path', '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' => 'absolute_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']), ) |