Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: use dol_buildpath

Browse Source
This commit is contained in:
Regis Houssin
2012-03-01 04:07:01 +08:00
parent dd9e150743
commit 0b945f0716
4 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/admin/commande.php
View File

@@ -251,14 +251,11 @@ print "</tr>\n";
clearstatcache();
// Check if there is external models to do asked by plugins
if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
}
$dirmodels=array_merge(array('/'),$conf->models_modules);
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($dirmodels as $reldir)
{
$dir = $dirroot . "/core/modules/commande/";
$dir = dol_buildpath($reldir."core/modules/commande/");
if (is_dir($dir))
{
@@ -387,17 +384,14 @@ print "</tr>\n";
clearstatcache();
// Check if there is external models to do asked by plugins
if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
}
$dirmodels=array_merge(array('/'),$conf->models_modules);
$var=true;
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
{
$dir = $dirroot . "/core/modules/commande".$valdir;
$dir = dol_buildpath($reldir."core/modules/commande".$valdir);
if (is_dir($dir))
{