Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24928/include
Modified Files:
functions_installer.inc.php
Log Message:
- Fix broken installation on Windows (is_executable doesn't exist)
Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- functions_installer.inc.php 13 Dec 2004 22:25:13 -0000 1.21
+++ functions_installer.inc.php 25 Dec 2004 00:37:56 -0000 1.22
@@ -66,7 +66,7 @@
/**
* Creates the needed tables - beware, they will be empty and need to be stuffed with
* default templates and such...
-*/
+*/
function serendipity_installDatabase() {
global $serendipity;
$queries = serendipity_parse_sql_tables(S9Y_INCLUDE_PATH . 'sql/db.sql');
@@ -137,7 +137,7 @@
$path[] = '/usr/local/bin';
foreach ($path as $dir) {
- if (@is_executable($dir . '/convert') || @is_file($dir . '/convert')) {
+ if ((function_exists('is_executable') && @is_executable($dir . '/convert')) || @is_file($dir . '/convert')) {
return $dir . '/convert';
}
}
|
