mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-23 18:48:51 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # test/integration/iTopModulesPhpVersionChecklistTest.php
This commit is contained in:
@@ -2408,11 +2408,11 @@ class utils
|
||||
* @throws \ApplicationException if constant value is invalid
|
||||
* @uses ITOP_CORE_VERSION
|
||||
*/
|
||||
public static function GetCoreVersionWikiSyntax()
|
||||
public static function GetCoreVersionWikiSyntax($sItopVersion = ITOP_CORE_VERSION)
|
||||
{
|
||||
$aExplodedVersion = explode('.', ITOP_CORE_VERSION);
|
||||
$aExplodedVersion = explode('.', $sItopVersion);
|
||||
|
||||
if (empty($aExplodedVersion[0]) || empty($aExplodedVersion[1])) {
|
||||
if ((false === isset($aExplodedVersion[0])) || (false === isset($aExplodedVersion[1]))) {
|
||||
throw new ApplicationException('iTop version is wrongfully configured!');
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user