# HG changeset patch
# User Dan
# Date 1237554817 14400
# Node ID 4e45f191dc33eb6b87a955dc7224a1ac896b82fb
# Parent  82bbfe3dc8a090d07f44ffc77df1977d37e859c9
A few fixes to Windows detection code

diff -r 82bbfe3dc8a0 -r 4e45f191dc33 install/includes/stages/website.php
--- a/install/includes/stages/website.php	Fri Mar 20 09:13:17 2009 -0400
+++ b/install/includes/stages/website.php	Fri Mar 20 09:13:37 2009 -0400
@@ -148,7 +148,7 @@
   ?>
   
   <?php
-  $patch_necessary = ( ( strtolower(PHP_OS) == 'win32' || strtolower(PHP_OS) == 'winnt' ) && substr(@$_SERVER['SERVER_SOFTWARE'], 'Apache/2.2') );
+  $patch_necessary = ( ( strtolower(PHP_OS) == 'win32' || strtolower(PHP_OS) == 'winnt' ) && strstr(@$_SERVER['SERVER_SOFTWARE'], 'Apache/2.2') );
   if ( defined('WINDOWS_MOD_REWRITE_WORKAROUNDS') )
   {
     ?>
diff -r 82bbfe3dc8a0 -r 4e45f191dc33 plugins/SpecialPageFuncs.php
--- a/plugins/SpecialPageFuncs.php	Fri Mar 20 09:13:17 2009 -0400
+++ b/plugins/SpecialPageFuncs.php	Fri Mar 20 09:13:37 2009 -0400
@@ -424,9 +424,9 @@
     $platform = 'Linux';
   else if(file_exists('/hurd/pfinet')) // I have a little experience with GNU/Hurd :-) http://hurdvm.enanocms.org/
     $platform = 'GNU/Hurd';
-  else if(file_exists('C:\Windows\system32\ntoskrnl.exe'))
+  else if(strtolower(PHP_OS) == 'winnt')
     $platform = 'Windows NT';
-  else if(file_exists('C:\Windows\system\krnl386.exe'))
+  else if(strtolower(PHP_OS) == 'win32')
     $platform = 'Windows 9x/DOS';
   else if(file_exists('/System/Library/CoreServices/SystemVersion.plist'))
     $platform = 'Mac OS X';