Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20847/include
Modified Files:
functions_installer.inc.php
Log Message:
Fix possible problem on windows installations where the installer could freeze when enabling the use of imagick
Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- functions_installer.inc.php 25 Dec 2004 00:37:56 -0000 1.22
+++ functions_installer.inc.php 26 Dec 2004 19:00:49 -0000 1.23
@@ -471,10 +471,8 @@
$errs[] = sprintf(DIRECTORY_RUN_CMD , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_ARCHIVES);
}
- // plugins directory now part of basic CVS
-
// Check imagick
- if ($_POST['magick'] == 'true' && !@is_executable($_POST['convert'])) {
+ if ($_POST['magick'] == 'true' && function_exists('is_executable') && !@is_executable($_POST['convert'])) {
$errs[] = sprintf(CANT_EXECUTE_BINARY, 'convert imagemagick');
}
|
