diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-20 23:11:40 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-20 23:11:40 +0100 |
| commit | 5069da8d52a5df22248dfbbf5a1a5e51f589c8f9 (patch) | |
| tree | 70f5f5c7ed06011c508e7b53a48eed205c23137e /phpBB/includes/acp/acp_attachments.php | |
| parent | 5d69f6159caf8107062262a093ad6c590c61e2b1 (diff) | |
| parent | 4d0b04a397e79f368ec0762d64c068e382c2eb21 (diff) | |
| download | forums-5069da8d52a5df22248dfbbf5a1a5e51f589c8f9.tar forums-5069da8d52a5df22248dfbbf5a1a5e51f589c8f9.tar.gz forums-5069da8d52a5df22248dfbbf5a1a5e51f589c8f9.tar.bz2 forums-5069da8d52a5df22248dfbbf5a1a5e51f589c8f9.tar.xz forums-5069da8d52a5df22248dfbbf5a1a5e51f589c8f9.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13519] Correctly validate imagick path as path and not string
Diffstat (limited to 'phpBB/includes/acp/acp_attachments.php')
| -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 6e3000d8e6..fa5df3d418 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -153,7 +153,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:0:999999999999999', 'type' => 'number:0:999999999999999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'img_min_thumb_filesize' => array('lang' => 'MIN_THUMB_FILESIZE', 'validate' => 'int:0:999999999999999', 'type' => 'number:0:999999999999999', '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:0:9999', 'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'img_link' => array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int:0:9999', 'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), ) |