diff options
| author | Stig Bakken <ssb@php.net> | 2003-04-03 23:11:50 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 2003-04-03 23:11:50 +0000 |
| commit | 360d1da529af0b1a467a1cb9aafc94076fab02ea (patch) | |
| tree | d65e63813dce2b81e99ff7850462147ee34dfe3b /pear/OS/Guess.php | |
| parent | e8532176511570d628e53289ab8aeb79d5ff4b12 (diff) | |
| download | php-git-360d1da529af0b1a467a1cb9aafc94076fab02ea.tar.gz | |
* windows bugfix
Diffstat (limited to 'pear/OS/Guess.php')
| -rw-r--r-- | pear/OS/Guess.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pear/OS/Guess.php b/pear/OS/Guess.php index 92a52ef116..959476d69a 100644 --- a/pear/OS/Guess.php +++ b/pear/OS/Guess.php @@ -123,7 +123,15 @@ class OS_Guess $release = "$parts[3].$parts[2]"; break; case 'Windows': - $release = $parts[3]; + switch ($parts[1]) { + case '95/98': + $release = '9x'; + break; + default: + $release = $parts[1]; + break; + } + $cpu = 'i386'; break; case 'Linux': $extra = $this->_detectGlibcVersion(); @@ -241,7 +249,7 @@ class OS_Guess { if (strcspn($fragment, '*?') < strlen($fragment)) { $reg = '^' . str_replace(array('*', '?', '/'), array('.*', '.', '\\/'), $fragment) . '$'; - return eregi($preg, $value); + return eregi($reg, $value); } return ($fragment == '*' || !strcasecmp($fragment, $value)); } |