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

Merge pull request #24255 from hregis/develop

Browse Source 
FIX return $conf->entity if $object->entity is null
This commit is contained in:
Laurent Destailleur 2023-03-18 11:50:39 +01:00 committed by GitHub
commit 41a98ee52c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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($module) && !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)];
} }
/** /**