Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 16:01:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
develop
This commit is contained in:
Laurent Destailleur
2023-12-28 12:39:45 +01:00
parent 163a09d6fd dc525dd78e
commit aff0d68035
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,10 +134,10 @@ function getMultidirOutput($object, $module = '')
if ($module == 'fichinter') {
$module = 'ficheinter';
}
if (isset($conf->$module)) {
if (isset($conf->$module) && property_exists($conf->$module, 'multidir_output')) {
return $conf->$module->multidir_output[(empty($object->entity) ? $conf->entity : $object->entity)];
} else {
return 'error-diroutput-not-defined-ffor-this-object='.$module;
return 'error-diroutput-not-defined-for-this-object='.$module;
}
}