aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-01-07 19:29:50 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-01-07 19:29:50 +0000
commitb29ba5343d86aeeacdb59d44560c486e52f3ffa7 (patch)
treeb4dab680c10f8a2123fdf8c83da8a5faf78a8896 /phpBB/includes/acp
parentbbf09989b02dfaee9c3fa57b01c4a5766018a5b7 (diff)
downloadforums-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/acp')
-rw-r--r--phpBB/includes/acp/acp_attachments.php6
1 files changed, 3 insertions, 3 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'] .= '/';
}
}