diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-03-29 19:50:58 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-03-29 19:50:58 +0200 |
| commit | a3f7e0f4411f35b8588aa2fd3f788e298e2bd678 (patch) | |
| tree | dc5a5bc1848609e77bfd7a157b8ccf26cf169170 /phpBB/includes/acp/acp_attachments.php | |
| parent | 67d81a1ce6e6b684c19d43c50d422a3597e5300d (diff) | |
| parent | 1a484f08bbacf2d2f97f94a0583095ae83a92bec (diff) | |
| download | forums-a3f7e0f4411f35b8588aa2fd3f788e298e2bd678.tar forums-a3f7e0f4411f35b8588aa2fd3f788e298e2bd678.tar.gz forums-a3f7e0f4411f35b8588aa2fd3f788e298e2bd678.tar.bz2 forums-a3f7e0f4411f35b8588aa2fd3f788e298e2bd678.tar.xz forums-a3f7e0f4411f35b8588aa2fd3f788e298e2bd678.zip | |
Merge branch '3.1.x'
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 6bef42c472..78488b4048 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' => '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: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']), ) |