composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 22:48:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3436 fix Setup

Browse Source 
Was blocked because using iTop 3.0.0 with datamodels/2.x dir : \SetupUtils::GetCompatibleDataModelDir wasn't ok with that :o)
This method is no more present, and we're calling \SetupUtils::GetLatestDataModelDir only
In other words, we're picking the latest datamodel/*.x dir (greatest number)
This commit is contained in:
Pierre Goiffon
2020-11-16 17:51:52 +01:00
parent c2e31de263
commit 07cc8bf508
2 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup/setuputils.class.inc.php
View File

@@ -1915,19 +1915,6 @@ JS
return false;
}
public static function GetCompatibleDataModelDir($sInstalledVersion)
{
if (preg_match('/^([0-9]+)\./', $sInstalledVersion, $aMatches)) {
$sMajorVersion = $aMatches[1];
$sDir = APPROOT.'datamodels/'.$sMajorVersion.'.x/';
if (is_dir($sDir)) {
return $sDir;
}
}
return false;
}
public static function GetDataModelVersion($sDatamodelDir)
{
$sVersionFile = $sDatamodelDir.'version.xml';