use ";" instead of ":" for windows

diff --git a/docs/NEWS b/docs/NEWS
index 18f7d3cf9cee60b24c1d1178c034fe240721f8e8..4f41986031fdc558067c66be47bfcaf05e9c06a9 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * Adjusted checking for "convert" binary in installation for
+      Windows servers. Thanks to BobRock! (garvinhicking)
+
     * BBCode plugin: Allow ~ and ! URL characters (garvinhicking)
     
     * Made serendipity_event_blogpdf an external plugin (nohn)

diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index baaa97062b9f8cd8650d052938e1039b33233740..f5cf28551dd5484fda2c2d6f761f239ddaae8fdd 100644 (file)
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -155,7 +155,7 @@ function serendipity_query_default($optname, $default, $usertemplate = false, $t
             $path[] = ini_get('safe_mode_exec_dir');
 
             if (isset($_SERVER['PATH'])) {
-                $path = array_merge($path, explode(':', $_SERVER['PATH']));
+                $path = array_merge($path, explode(PATH_SEPARATOR, $_SERVER['PATH']));
             }
 
             /* add some other possible locations to the path while we are at it,
@@ -165,7 +165,7 @@ function serendipity_query_default($optname, $default, $usertemplate = false, $t
             $path[] = '/usr/local/bin';
 
             foreach ($path as $dir) {
-                if ((function_exists('is_executable') && @is_executable($dir . '/convert')) || @is_file($dir . '/convert')) {
+                if (!empty($dir) && (function_exists('is_executable') && @is_executable($dir . '/convert')) || @is_file($dir . '/convert')) {
                     return $dir . '/convert';
                 }
             }