From 52b2f00a9aa543b2bfd32b52c20cf0b9f4a5c685 Mon Sep 17 00:00:00 2001 From: Guillaume Luchet Date: Thu, 25 Oct 2012 22:24:08 +0200 Subject: [PATCH] Use only the real php version number extracted from PHP_VERSION (ie: 5.3.10 instead of 5.3.10-1ubuntu3.4 --- downloader/lib/Mage/Connect/Package.php | 6 ++++-- lib/Mage/Connect/Package.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/downloader/lib/Mage/Connect/Package.php b/downloader/lib/Mage/Connect/Package.php index d785876165e3e..71a8953e540cc 100644 --- a/downloader/lib/Mage/Connect/Package.php +++ b/downloader/lib/Mage/Connect/Package.php @@ -575,8 +575,10 @@ public function checkPhpVersion() $min = $this->getDependencyPhpVersionMin(); $max = $this->getDependencyPhpVersionMax(); - $minOk = $min? version_compare(PHP_VERSION, $min, ">=") : true; - $maxOk = $max? version_compare(PHP_VERSION, $max, "<=") : true; + $version = substr(PHP_VERSION,0,strpos(PHP_VERSION, "-")); + + $minOk = $min? version_compare($version, $min, ">=") : true; + $maxOk = $max? version_compare($version, $max, "<=") : true; if(!$minOk || !$maxOk) { $err = "requires PHP version "; diff --git a/lib/Mage/Connect/Package.php b/lib/Mage/Connect/Package.php index 4a3f4fdb9487d..e5199701df64a 100644 --- a/lib/Mage/Connect/Package.php +++ b/lib/Mage/Connect/Package.php @@ -738,8 +738,10 @@ public function checkPhpVersion() $min = $this->getDependencyPhpVersionMin(); $max = $this->getDependencyPhpVersionMax(); - $minOk = $min? version_compare(PHP_VERSION, $min, ">=") : true; - $maxOk = $max? version_compare(PHP_VERSION, $max, "<=") : true; + $version = substr(PHP_VERSION,0,strpos(PHP_VERSION, "-")); + + $minOk = $min? version_compare($version, $min, ">=") : true; + $maxOk = $max? version_compare($version, $max, "<=") : true; if(!$minOk || !$maxOk) { $err = "requires PHP version ";