Fix: duplicate module shown

This commit is contained in:
Laurent Destailleur 2011-12-08 23:05:06 +01:00
parent 8448d8e8ef
commit 9eab44536d

View File

@ -84,23 +84,23 @@ $j = 0; // j is module number. Automatically affected if module number not defin
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/core/modules/"; $modulesdir[$dirroot . '/core/modules/'] = $dirroot . '/core/modules/';
$handle=@opendir($dirroot); $handle=@opendir($dirroot);
if (is_resource($handle)) if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{ {
while (($file = readdir($handle))!==false) if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{ {
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') if (is_dir($dirroot . '/' . $file . '/core/modules/'))
{ {
if (is_dir($dirroot . '/' . $file . '/core/modules/')) $modulesdir[$dirroot . '/' . $file . '/core/modules/'] = $dirroot . '/' . $file . '/core/modules/';
{ }
$modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; }
}
}
}
closedir($handle);
} }
closedir($handle);
}
} }
//var_dump($modulesdir); //var_dump($modulesdir);