Reintegrated a number of fixes from trunk:

#672 and #673 Physical interfaces
#683 DB name can have numbers + hyphen
#664 Could not logon after an upgrade of 1.x
#686 Issue with default values on upgrade
#657 Quotes not allowed in synchro name/desc
#659 Error report not displayed during the setup
#660 Issue with ZendServer
#661 and #662 Issues with autocompletes
#666 Import: reconciliation of Software CIs
#668 Management IP not visible anywhere
#675 Drill-down on graph failing
#679 Setup: dependency between modules
#680 Setup: missing php-xml (module "dom")


SVN:2.0[2643]
This commit is contained in:
Romain Quetiez
2013-03-20 09:15:11 +00:00
parent d2f9458516
commit be4a2e52bc
14 changed files with 177 additions and 64 deletions

View File

@@ -114,6 +114,7 @@ class ModuleDiscovery
{
$aDependencies[$sId] = $aModule['dependencies'];
}
ksort($aDependencies);
$aOrderedModules = array();
$iLoopCount = 1;
while(($iLoopCount < count(self::$m_aModules)) && (count($aDependencies) > 0) )