diff options
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 6 | ||||
| -rw-r--r-- | phpBB/install/install.php | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index e2d8770066..8097e9b2d3 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -1120,7 +1120,9 @@ class acp_attachments $exe = ((defined('PHP_OS')) && (preg_match('#win#i', PHP_OS))) ? '.exe' : ''; - if (empty(getenv('MAGICK_HOME'))) + $magic_home = getenv('MAGICK_HOME'); + + if (empty($magic_home)) { $locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/'); $path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH')))); @@ -1144,7 +1146,7 @@ class acp_attachments } else { - $imagick = str_replace('\\', '/', getenv('MAGICK_HOME')); + $imagick = str_replace('\\', '/', $magic_home); } return $imagick; diff --git a/phpBB/install/install.php b/phpBB/install/install.php index 8fd4875329..0c3521eb1d 100644 --- a/phpBB/install/install.php +++ b/phpBB/install/install.php @@ -416,9 +416,11 @@ if ($stage == 0) $exe = ((defined('PHP_OS')) && (preg_match('#win#i', PHP_OS))) ? '.exe' : ''; + $magic_home = getenv('MAGICK_HOME'); + // Imagemagick are you there? Give me a sign or a path ... $img_imagick = ''; - if (empty(getenv('MAGICK_HOME'))) + if (empty($magic_home)) { $locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/'); $path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH')))); @@ -441,7 +443,7 @@ if ($stage == 0) } else { - $img_imagick = str_replace('\\', '/', getenv('MAGICK_HOME')); + $img_imagick = str_replace('\\', '/', $magic_home); } ?> |