diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-07 19:29:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-07 19:29:50 +0000 |
| commit | b29ba5343d86aeeacdb59d44560c486e52f3ffa7 (patch) | |
| tree | b4dab680c10f8a2123fdf8c83da8a5faf78a8896 /phpBB/includes | |
| parent | bbf09989b02dfaee9c3fa57b01c4a5766018a5b7 (diff) | |
| download | forums-b29ba5343d86aeeacdb59d44560c486e52f3ffa7.tar forums-b29ba5343d86aeeacdb59d44560c486e52f3ffa7.tar.gz forums-b29ba5343d86aeeacdb59d44560c486e52f3ffa7.tar.bz2 forums-b29ba5343d86aeeacdb59d44560c486e52f3ffa7.tar.xz forums-b29ba5343d86aeeacdb59d44560c486e52f3ffa7.zip | |
grr
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8314 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index e2ee126479..08b5f863e0 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -187,13 +187,13 @@ class acp_attachments if ($this->new_config['img_imagick']) { // Change path separator - $this->new_config['img_magick'] = str_replace('\\', '/', $this->new_config['img_magick']); + $this->new_config['img_imagick'] = str_replace('\\', '/', $this->new_config['img_imagick']); $this->new_config['img_imagick'] = str_replace(array('convert', '.exe'), array('', ''), $this->new_config['img_imagick']); // Check for trailing slash - if (substr($this->new_config['img_magick'], -1) !== '/') + if (substr($this->new_config['img_imagick'], -1) !== '/') { - $this->new_config['img_magick'] .= '/'; + $this->new_config['img_imagick'] .= '/'; } } diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 4b7387115a..04e56f3851 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -618,9 +618,9 @@ 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) !== '/') + if (substr($config['img_imagick'], -1) !== '/') { - $config['img_magick'] .= '/'; + $config['img_imagick'] .= '/'; } @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) . '"'); |