From cd3cc1b923bbc7066cc984fe5baab7966f81c74d Mon Sep 17 00:00:00 2001 From: websTTer Date: Sat, 16 Nov 2013 14:49:31 +0100 Subject: [PATCH] Fix installer isIIS() to include IIS versions greater than 7. --- dev/install/install.php5 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dev/install/install.php5 b/dev/install/install.php5 index b2fd65718..a7dc9fbea 100755 --- a/dev/install/install.php5 +++ b/dev/install/install.php5 @@ -362,15 +362,14 @@ class InstallRequirements { } /** - * Check if the web server is IIS. + * Check if the web server is IIS and version greater than the given version. * @return boolean */ - function isIIS($version = 7) { - if(strpos($this->findWebserver(), 'IIS/' . $version) !== false) { - return true; - } else { + function isIIS($fromVersion = 7) { + if(strpos($this->findWebserver(), 'IIS/') === false) { return false; } + return substr(strstr($this->findWebserver(), '/'), -3, 1) >= $fromVersion; } function isApache() { @@ -400,7 +399,7 @@ class InstallRequirements { function check() { $this->errors = null; $isApache = $this->isApache(); - $isIIS = $this->isIIS(7); + $isIIS = $this->isIIS(); $webserver = $this->findWebserver(); $this->requirePHPVersion('5.3.4', '5.3.2', array(