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

N°2969 - Fix relative path of dictionaries

Browse Source
This commit is contained in:
Eric
2020-08-20 14:45:43 +02:00
parent 4e5bbcde35
commit 87312d4457
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,11 @@ class ModuleDiscovery
{
$sModuleName = $aMatches[1];
$sDir = dirname($sFilePath);
foreach (array($sDir, $sDir.'/dictionaries') as $sRootDir)
$aDirs = [
$sDir => self::$m_sModulePath,
$sDir.'/dictionaries' => self::$m_sModulePath.'/dictionaries'
];
foreach ($aDirs as $sRootDir => $sPath)
{
if ($hDir = @opendir($sRootDir))
{
@@ -143,7 +147,7 @@ class ModuleDiscovery
$aMatches = array();
if (preg_match("/^[^\\.]+.dict.$sModuleName.php$/i", $sFile, $aMatches)) // Dictionary files named like <Lang>.dict.<ModuleName>.php are loaded automatically
{
self::$m_aModules[$sId]['dictionary'][] = $sRootDir.'/'.$sFile;
self::$m_aModules[$sId]['dictionary'][] = $sPath.'/'.$sFile;
}
}
closedir($hDir);