From b4bc50d9cc65426b247884cd30f4777080bc96bf Mon Sep 17 00:00:00 2001 From: sharvey Date: Tue, 27 Jul 2010 05:15:57 +0000 Subject: [PATCH] MINOR Allow checking for a specific IIS version (parameter to InstallRequirements::isIIS()) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108570 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- install.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.php b/install.php index 0e2fd9a..f113c1a 100644 --- a/install.php +++ b/install.php @@ -276,8 +276,8 @@ class InstallRequirements { * Check if the web server is IIS. * @return boolean */ - function isIIS() { - if(strpos($this->findWebserver(), 'IIS/7') !== false) { + function isIIS($version = 7) { + if(strpos($this->findWebserver(), 'IIS/' . $version) !== false) { return true; } else { return false; @@ -311,7 +311,7 @@ class InstallRequirements { function check() { $this->errors = null; $isApache = $this->isApache(); - $isIIS = $this->isIIS(); + $isIIS = $this->isIIS(7); $webserver = $this->findWebserver(); $this->requirePHPVersion('5.2.0', '5.1.0', array("PHP Configuration", "PHP5 installed", null, "PHP version " . phpversion()));