[php-blog-cvs] serendipity compat.php,1.15,1.16 serendipity_config.inc.php,1.65,1.66

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26565

Modified Files:
	compat.php serendipity_config.inc.php 
Log Message:
patches for windows compatibility, by Richard Thomas Harrison


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- serendipity_config.inc.php	4 Apr 2004 16:59:06 -0000	1.65
+++ serendipity_config.inc.php	5 Apr 2004 08:07:53 -0000	1.66
@@ -176,7 +176,7 @@
 }
 
 $old_include = @ini_get('include_path');
-@ini_set('include_path', $serendipity['serendipityPath'] . ':' . $serendipity['serendipityPath'] . 'bundled-libs/:' . $old_include);
+@ini_set('include_path', $serendipity['serendipityPath'] . PATH_SEPARATOR . $serendipity['serendipityPath'] . 'bundled-libs/' . PATH_SEPARATOR . $old_include);
 
 $serendipity['user']  = isset($_SESSION['serendipityUser'])  ? $_SESSION['serendipityUser']  : '';
 $serendipity['email'] = isset($_SESSION['serendipityEmail']) ? $_SESSION['serendipityEmail'] : '';

Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/compat.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- compat.php	4 Apr 2004 16:24:46 -0000	1.15
+++ compat.php	5 Apr 2004 08:07:53 -0000	1.16
@@ -12,7 +12,7 @@
         }
 
         return $data;
-    } 
+    }
 }
 
 if (!isset($_REQUEST)) {
@@ -74,7 +74,7 @@
         array_walk($_COOKIE, 'serendipity_strip_quotes');
     }
 
-    if (@count($_FILES)) {
+    if (@count($_FILES) && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
         array_walk($_FILES,   'serendipity_strip_quotes');
     }
 }
@@ -89,13 +89,13 @@
 function serendipity_get_bool($item) {
     $translation = array('true'  => true,
                          'false' => false);
-                         
+
     if (isset($translation[$item])) {
         return $translation[$item];
     } else {
         return $item;
     }
-} 
+}
 
 function serendipity_version($version) {
     return preg_replace('@\-.+$@', '', $version);