composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N.520 Setup: conflicts when a module in "extensions" is an upgrade of a module that already exists in datamodels/2.x. The most recent module must be installed and the older one must be ignored.

Browse Source 
SVN:trunk[4477]
This commit is contained in:
Romain Quetiez
2016-11-17 15:45:34 +00:00
parent 8a913a18cf
commit e586ba8d6e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/modulediscovery.class.inc.php
View File

@@ -86,10 +86,14 @@ class ModuleDiscovery
if (array_key_exists($sModuleName, self::$m_aModuleVersionByName))
{
if (version_compare($sModuleVersion, self::$m_aModuleVersionByName[$sModuleName], '>'))
if (version_compare($sModuleVersion, self::$m_aModuleVersionByName[$sModuleName]['version'], '>'))
{
// Newer version, let's upgrade
self::$m_aModuleVersionByName[$sModuleName] = $sModuleVersion;
$sIdToRemove = self::$m_aModuleVersionByName[$sModuleName]['id'];
unset(self::$m_aModules[$sIdToRemove]);
self::$m_aModuleVersionByName[$sModuleName]['version'] = $sModuleVersion;
self::$m_aModuleVersionByName[$sModuleName]['id'] = $sId;
}
else
{
@@ -100,7 +104,8 @@ class ModuleDiscovery
else
{
// First version to be loaded for this module, remember it
self::$m_aModuleVersionByName[$sModuleName] = $sModuleVersion;
self::$m_aModuleVersionByName[$sModuleName]['version'] = $sModuleVersion;
self::$m_aModuleVersionByName[$sModuleName]['id'] = $sId;
}
self::$m_aModules[$sId] = $aArgs;