diff options
| author | Jesus M. Castagnetto <jmcastagnetto@php.net> | 2003-04-14 11:50:42 +0000 |
|---|---|---|
| committer | Jesus M. Castagnetto <jmcastagnetto@php.net> | 2003-04-14 11:50:42 +0000 |
| commit | 9b91242e240ae04df4102e41091af3beb852c0f3 (patch) | |
| tree | ae388cb878ebfb7f21985321ef881757b33c104b | |
| parent | bfccea6853059081da5c0551a7423f473ffd3c1e (diff) | |
| download | php-git-9b91242e240ae04df4102e41091af3beb852c0f3.tar.gz | |
Fixing bug #23060
| -rw-r--r-- | pear/PEAR/Dependency.php | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/pear/PEAR/Dependency.php b/pear/PEAR/Dependency.php index b33dcd9054..22173ce625 100644 --- a/pear/PEAR/Dependency.php +++ b/pear/PEAR/Dependency.php @@ -199,14 +199,15 @@ class PEAR_Dependency */ function checkPHP(&$errmsg, $req, $relation = 'ge') { - if (substr($relation, 0, 2) == 'v.') { - $php_ver = phpversion(); - $operator = substr($relation, 2); - if (!version_compare("$php_ver", "$req", $operator)) { - $errmsg = "PHP version " . $this->signOperator($operator) . - " $req is required"; - return PEAR_DEPENDENCY_CONFLICT; - } + if (substr($req, 0, 2) == 'v.') { + $req = substr($req,2, strlen($req) - 2); + } + $php_ver = phpversion(); + $operator = substr($relation,0,2); + if (!version_compare("$php_ver", "$req", $operator)) { + $errmsg = "PHP version " . $this->signOperator($operator) . + " $req is required"; + return PEAR_DEPENDENCY_CONFLICT; } return false; } @@ -271,14 +272,15 @@ class PEAR_Dependency */ function checkZend(&$errmsg, $req, $relation = 'ge') { - if (substr($relation, 0, 2) == 'v.') { - $zend_ver = zend_version(); - $operator = substr($relation, 2); - if (!version_compare("$zend_ver", "$req", $operator)) { - $errmsg = "Zend version " . $this->signOperator($operator) . - " $req is required"; - return PEAR_DEPENDENCY_CONFLICT; - } + if (substr($req, 0, 2) == 'v.') { + $req = substr($req,2, strlen($req) - 2); + } + $zend_ver = zend_version(); + $operator = substr($relation,0,2); + if (!version_compare("$zend_ver", "$req", $operator)) { + $errmsg = "Zend version " . $this->signOperator($operator) . + " $req is required"; + return PEAR_DEPENDENCY_CONFLICT; } return false; } |