composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/uninstallation

Browse Source
This commit is contained in:
odain
2025-12-18 14:02:45 +01:00
parent 385302c44c 545028d68a
commit 9a8d87e2b5
25 changed files with 680 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/extensionsmap.class.inc.php
View File

@@ -499,7 +499,8 @@ class iTopExtensionsMap
*/
public function GetAllExtensionsWithPreviouslyInstalled(): array
{
return array_merge($this->aExtensions, $this->aInstalledExtensions ?? []);
//Mind the order, local extensions data must overwrite installed extensions data since installed extensions does not have the associated modules.
return array_merge($this->aInstalledExtensions ?? [], $this->aExtensions);
}
/**