1
0
This commit is contained in:
Garvin Hicking
2007-01-18 16:07:34 +00:00
parent f5597d0d6f
commit 1d08aa4633
2 changed files with 4 additions and 4 deletions

@ -237,11 +237,11 @@ function serendipity_query_default($optname, $default, $usertemplate = false, $t
$path[] = '/usr/local/bin';
foreach ($path as $dir) {
if (!empty($dir) && (function_exists('is_executable') && @is_executable($dir . '/convert')) || @is_file($dir . '/convert')) {
if (!empty($dir) && (function_exists('is_executable') && is_readable($dir) && @is_executable($dir . '/convert')) || @is_file($dir . '/convert')) {
return $dir . '/convert';
}
if (!empty($dir) && (function_exists('is_executable') && @is_executable($dir . '/convert.exe')) || @is_file($dir . '/convert.exe')) {
if (!empty($dir) && (function_exists('is_executable') && is_readable($dir . '/convert') && @is_executable($dir . '/convert.exe')) || @is_file($dir . '/convert.exe')) {
return $dir . '/convert.exe';
}
}