diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-06 17:00:09 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-06 17:00:09 +0000 |
| commit | 5dddcb42aee429bcd77f18ec1ae94677a01b1c3a (patch) | |
| tree | a12729e8a7f7815589bea214fe0a99bf20ce6e1e /phpBB/includes/functions_posting.php | |
| parent | 6dfa77098619c461649dcef22aac142227d3653b (diff) | |
| download | forums-5dddcb42aee429bcd77f18ec1ae94677a01b1c3a.tar forums-5dddcb42aee429bcd77f18ec1ae94677a01b1c3a.tar.gz forums-5dddcb42aee429bcd77f18ec1ae94677a01b1c3a.tar.bz2 forums-5dddcb42aee429bcd77f18ec1ae94677a01b1c3a.tar.xz forums-5dddcb42aee429bcd77f18ec1ae94677a01b1c3a.zip | |
- Do not split topic list for topics being promoted to announcements after been moved to another forum (Bug #18635)
- Allow editing usernames within database_update on username cleanup (Bug #18415)
- Fixing wrong sync() calls if moving all posts by a member in ACP (Bug #18385)
- Check entered imagemagick path for trailing slash (Bug #18205)
- Use proper title on index for new/unread posts (Bug #13101) - patch provided by Pyramide
- Allow calls to $user->set_cookie() define no cookie time for setting session cookies (Bug #18025)
git-svn-id: file:///svn/phpbb/trunk@8310 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 020ba0e0e3..664ed7dd27 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -618,6 +618,11 @@ function create_thumbnail($source, $destination, $mimetype) // Only use imagemagick if defined and the passthru function not disabled if ($config['img_imagick'] && function_exists('passthru')) { + if (substr($config['img_magick'], -1) !== '/') + { + $config['img_magick'] .= '/'; + } + @passthru(escapeshellcmd($config['img_imagick']) . 'convert' . ((defined('PHP_OS') && preg_match('#^win#i', PHP_OS)) ? '.exe' : '') . ' -quality 85 -antialias -sample ' . $new_width . 'x' . $new_height . ' "' . str_replace('\\', '/', $source) . '" +profile "*" "' . str_replace('\\', '/', $destination) . '"'); if (file_exists($destination)) |