From: garvinhicking <garvinhicking>
Date: Tue, 10 May 2005 16:35:31 +0000 (+0000)
Subject: Also look for "convert.exe", satisfying windows users.
X-Git-Tag: 0.8.1~12
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=50a8df637273c905c550fd4e2200879ba335f9a6;p=s9y.git

Also look for "convert.exe", satisfying windows users.
Thanks to pattyjj from IRC!
---

diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index d9def80..f9e5973 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -168,6 +168,10 @@ function serendipity_query_default($optname, $default, $usertemplate = false, $t
                 if (!empty($dir) && (function_exists('is_executable') && @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')) {
+                    return $dir . '/convert.exe';
+                }
             }
             return $default;