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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-14 23:20:21 +01:00
commit 55deccf364
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/functions.lib.php
View File

@ -6698,6 +6698,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
$substitfiles = dol_dir_list($dir, 'files', 0, 'functions_'); $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');
foreach ($substitfiles as $substitfile) foreach ($substitfiles as $substitfile)
{ {
$reg = array();
if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg))
{ {
$module = $reg[1]; $module = $reg[1];
@ -6707,7 +6708,9 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
require_once $dir.$substitfile['name']; require_once $dir.$substitfile['name'];
// Call the user's function, and only if it is defined // Call the user's function, and only if it is defined
$function_name = $module."_".$callfunc; $function_name = $module."_".$callfunc;
if (function_exists($function_name)) $function_name($substitutionarray, $outputlangs, $object, $parameters); if (function_exists($function_name)) {
$function_name($substitutionarray, $outputlangs, $object, $parameters);
}
} }
} }
} }

1
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -464,6 +464,7 @@ class pdf_crabe extends ModelePDFFactures
$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object); $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
complete_substitutions_array($substitutionarray, $outputlangs, $object); complete_substitutions_array($substitutionarray, $outputlangs, $object);
$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs); $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow); $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);