mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2631 from f0o/issue-2630

Browse Source 
Fix silly JpGraph version compare
This commit is contained in:
Neil Lathwood
2015-12-16 15:13:32 +00:00
parent 079e088cd7 7542d00b8a
commit 8f87fda4bd
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
html/includes/jpgraph/src/jpgraph.php
View File

@@ -222,21 +222,16 @@ if (!defined('MBTTF_DIR')) {
}
}
//
// Check minimum PHP version
//
/*
* Check minimum PHP version
* @author f0o <f0o@devilcode.org>
* @copyright 2015 f0o, LibreNMS
* @license GPL
* @package LibreNMS
* @subpackage Billing
*/
function CheckPHPVersion($aMinVersion) {
list($majorC, $minorC, $editC) = preg_split('/[\/.-]/', PHP_VERSION);
list($majorR, $minorR, $editR) = preg_split('/[\/.-]/', $aMinVersion);
if ($majorC != $majorR) return false;
if ($majorC < $majorR) return false;
// same major - check minor
if ($minorC > $minorR) return true;
if ($minorC < $minorR) return false;
// and same minor
if ($editC >= $editR) return true;
return true;
return version_compare(PHP_VERSION, $aMinVersion, '>=');
}
//