diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-06 10:19:39 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-06 10:19:39 +0100 |
| commit | cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e (patch) | |
| tree | 7f5b00319e83f58fb7e77a709d813d0d74f54991 /phpBB/includes/acp/acp_attachments.php | |
| parent | 1e4853507abb3fc50d6d7edd048d3cf88e905f1c (diff) | |
| parent | 7c5d872344a59f0fe2323d34885e543a09111ca7 (diff) | |
| download | forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.tar forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.tar.gz forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.tar.bz2 forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.tar.xz forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.zip | |
Merge branch 'ticket/13568' into ticket/13568-asc
Conflicts:
phpBB/adm/index.php
phpBB/includes/acp/acp_attachments.php
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 2873b48fa4..67fba1094d 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']), ) |