From f5f1543dac4466d7162bed67f54c6e1c1545320a Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 28 Dec 2023 11:49:19 +0100 Subject: [PATCH 1/3] fix : Warning: Undefined property: stdClass:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/functions.lib.php on line 138 --- htdocs/core/lib/functions.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e846a9a085c..dad79b1704c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -134,11 +134,11 @@ function getMultidirOutput($object, $module = '') if ($module == 'fichinter') { $module = 'ficheinter'; } - if (isset($conf->$module)) { - return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)]; - } else { - return 'error-diroutput-not-defined-ffor-this-object='.$module; - } + if (isset($conf->$module) && property_exists($conf->$module, 'multidir_output')) { + return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)]; + } else { + return 'error-diroutput-not-defined-for-this-object='.$module; + } } /** From 7a6a91621838c4c1bac8a45522fe7fc9e174b263 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 28 Dec 2023 11:54:48 +0100 Subject: [PATCH 2/3] fix : Warning: Undefined property: stdClass:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/functions.lib.php on line 138 and correct tabs --- htdocs/core/lib/functions.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index dad79b1704c..ae72651d6e6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -135,9 +135,9 @@ function getMultidirOutput($object, $module = '') $module = 'ficheinter'; } if (isset($conf->$module) && property_exists($conf->$module, 'multidir_output')) { - return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)]; - } else { - return 'error-diroutput-not-defined-for-this-object='.$module; + return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)]; + } else { + return 'error-diroutput-not-defined-for-this-object='.$module; } } From 9484953b7ab6e06770562750c263c5751229670b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Dec 2023 12:34:09 +0100 Subject: [PATCH 3/3] Update functions.lib.php --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index ae72651d6e6..f505756ddb2 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -138,7 +138,7 @@ function getMultidirOutput($object, $module = '') return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)]; } else { return 'error-diroutput-not-defined-for-this-object='.$module; - } + } } /**