lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6844 from defrance/patch-10

Browse Source 
problems with additionnal template type
This commit is contained in:
Laurent Destailleur 2017-05-18 17:48:30 +02:00 committed by GitHub
commit 92d7b907be
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/functions2.lib.php
View File

@ -1530,8 +1530,10 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$const=$obj->description; $const=$obj->description;
$dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
$listoffiles=array(); $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
$listoffiles=array();
// Now we add models found in directories scanned // Now we add models found in directories scanned
$listofdir=explode(',',$dirtoscan); $listofdir=explode(',',$dirtoscan);
@ -2111,4 +2113,4 @@ function cartesianArray(array $input) {
} }
return $result; return $result;
} }