Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests 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
parent 66e4de628c 5f9b53004b
commit 55deccf364
2 changed files with 5 additions and 1 deletions
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_');
foreach ($substitfiles as $substitfile)
{
$reg = array();
if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg))
{
$module = $reg[1];
@@ -6707,7 +6708,9 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
require_once $dir.$substitfile['name'];
// Call the user's function, and only if it is defined
$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);
}
}
}
}