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

(Retrofit from trunk) Fixed regression introduced by [r5235]: some directories (like data/production-modules) may not always exist... this should not stop the setup.

Browse Source 
SVN:2.4[5273]
This commit is contained in:
Denis Flaven
2018-01-17 10:16:42 +00:00
parent e5b318b94f
commit 4ee6e6f915
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,8 +359,14 @@ class iTopExtensionsMap
{
$aSearchDirs[] = APPROOT.'/datamodels/1.x';
}
$aSearchDirs[] = APPROOT.'/extensions';
$aSearchDirs[] = APPROOT.'/data/'.$sFromEnvironment.'-modules';
if (is_dir(APPROOT.'/extensions'))
{
$aSearchDirs[] = APPROOT.'/extensions';
}
if (is_dir(APPROOT.'/data/'.$sFromEnvironment.'-modules'))
{
$aSearchDirs[] = APPROOT.'/data/'.$sFromEnvironment.'-modules';
}
try
{