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 d9def80a5509ab494380e7620fee70c6134ef8a7..f9e597357476996dee82bfe5b1340fbc3f8a3348 100644 (file)
--- 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;