From: garvinhicking <garvinhicking>
Date: Fri, 14 Mar 2008 08:11:49 +0000 (+0000)
Subject: backport
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0e759c1a1563bf14cd47bacb2c9ea2b3b700008f;p=s9y.git

backport
---

diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index 22c4285..669606f 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -241,11 +241,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_readable($dir) && @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_readable($dir . '/convert') && @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';
                 }
             }