From 86c7bbe33a426ab703333b210d27135bb455b7c4 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 18 Mar 2023 11:30:44 +0100 Subject: [PATCH 1/3] FIX return $conf->entity if $object->entity is null --- htdocs/core/lib/functions.lib.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 69b437ab650..a07b1152393 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -82,15 +82,13 @@ if (!function_exists('utf8_decode')) { function getMultidirOutput($object, $module = '') { global $conf; - if (!is_object($object)) { + if (!is_object($object) && empty($module)) { return null; } - if (empty($module) && !empty($object->element)) { + if (!empty($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)]; } /** From 5f9ac6cd734242174860c7d70b55654110353d76 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 18 Mar 2023 11:43:45 +0100 Subject: [PATCH 2/3] FIX regression --- htdocs/core/lib/functions.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a07b1152393..f6d0710de66 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -85,8 +85,10 @@ function getMultidirOutput($object, $module = '') if (!is_object($object) && empty($module)) { return null; } - if (!empty($object->element)) { + if (empty($module) && !empty($object->element)) { $module = $object->element; + } else { + return null; } return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)]; } From 5e9eb6f185b2cd67f23839704d4993a4f0045240 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 18 Mar 2023 11:49:57 +0100 Subject: [PATCH 3/3] FIX missing $module value if $module not empty and $object->element is empty --- htdocs/core/lib/functions.lib.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f6d0710de66..0c0a721a4ea 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -87,8 +87,6 @@ function getMultidirOutput($object, $module = '') } if (empty($module) && !empty($object->element)) { $module = $object->element; - } else { - return null; } return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)]; }