diff options
Diffstat (limited to 'phpBB/adm/admin_attachments.php')
| -rw-r--r-- | phpBB/adm/admin_attachments.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/adm/admin_attachments.php b/phpBB/adm/admin_attachments.php index 61581f27ae..7dfb5416d7 100644 --- a/phpBB/adm/admin_attachments.php +++ b/phpBB/adm/admin_attachments.php @@ -481,6 +481,9 @@ if ($mode == 'attach') $new['img_imagick'] = search_imagemagick(); } + // We strip eventually manual added convert program, we only want the patch + $new['img_imagick'] = str_replace(array('convert', '.exe'), array('', ''), $new['img_imagick']); + $select_size_mode = size_select('size', $size); $select_quota_size_mode = size_select('quota_size', $quota_size); $select_pm_size_mode = size_select('pm_size', $pm_size); @@ -1467,7 +1470,7 @@ function search_imagemagick() foreach ($locations as $location) { - if (file_exists($location . 'convert' . $exe) && @is_readable($location . 'convert' . $exe) && @filesize($location . 'convert' . $exe) > 80000) + if (file_exists($location . 'convert' . $exe) && @is_readable($location . 'convert' . $exe) && @filesize($location . 'convert' . $exe) > 10000) { $imagick = str_replace('\\', '/', $location); continue; |