From b980d193ec11e0d92c97ee88acece949756ed67a Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Sat, 23 Apr 2005 09:50:32 +0000
Subject: [PATCH] use ";" instead of ":" for windows

---
 docs/NEWS                           | 3 +++
 include/functions_installer.inc.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 18f7d3c..4f41986 100644
--- 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 baaa970..f5cf285 100644
--- 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';
                 }
             }
-- 
2.39.5