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

FIX return $conf->entity if $object->entity is null

Browse Source
This commit is contained in:
Regis Houssin 2023-03-18 11:30:44 +01:00
parent dcf0fbd1c6
commit 86c7bbe33a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,15 +82,13 @@ if (!function_exists('utf8_decode')) {
function getMultidirOutput($object, $module = '') function getMultidirOutput($object, $module = '')
{ {
global $conf; global $conf;
if (!is_object($object)) { if (!is_object($object) && empty($module)) {
return null; return null;
} }
if (empty($module) && !empty($object->element)) { if (!empty($object->element)) {
$module = $object->element; $module = $object->element;
} else {
return null;
} }
return $conf->$module->multidir_output[$object->entity]; return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)];
} }
/** /**