Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-05 16:42:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Code was sharing loop for custom dir and loop for subdir modules.

Browse Source 
The loop to manage customdir must be managed by the dol_buildpath so
only loop on / + module dir must be done.
This commit is contained in:
Laurent Destailleur
2012-02-29 20:07:17 +01:00
parent 7e3cb90f5a
commit 51fb1b2385
6 changed files with 53 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/core/modules/commande/modules_commande.php
View File

@@ -158,7 +158,6 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
$error=0;
$dir = "/core/modules/commande/";
$srctemplatepath='';
// Positionne le modele sur le nom du modele a utiliser
@@ -181,22 +180,18 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
$modele=$tmp[0];
$srctemplatepath=$tmp[1];
}
// 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);
}
foreach ($conf->file->dol_document_root as $dirroot)
{
// Search template file
$file=''; $classname=''; $filefound=0;
// Search template files
$file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),$conf->models_modules);
foreach($dirmodels as $reldir)
{
foreach(array('doc','pdf') as $prefix)
{
$file = $prefix."_".$modele.".modules.php";
$file = $prefix."_".$modele.".modules.php";
// On verifie l'emplacement du modele
$file = $dirroot.$dir.'doc/'.$file;
$file=dol_buildpath($reldir."core/modules/commande/doc/".$file,0);
if (file_exists($file))
{
$filefound=1;