From b758bb9ab4e548430ddbd586e5b837ba318c9cd5 Mon Sep 17 00:00:00 2001 From: John BOTELLA Date: Wed, 22 Nov 2023 09:27:12 +0100 Subject: [PATCH] Offset non-falsy-string on array{} in empty() does not exist. (#26745) --- htdocs/core/class/CMailFile.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index d72f0bea0f0..dc6fa98d8a5 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -1090,7 +1090,12 @@ class CMailFile $keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array); $keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME'; - $OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : '')); + $OAUTH_SERVICENAME = 'Unknown'; + if ( array_key_exists($keyforsupportedoauth2array, $supportedoauth2array) + && array_key_exists('name', $supportedoauth2array[$keyforsupportedoauth2array]) + && !empty($supportedoauth2array[$keyforsupportedoauth2array]['name'])) { + $OAUTH_SERVICENAME = $supportedoauth2array[$keyforsupportedoauth2array]['name'].(!empty($keyforprovider) ? '-'.$keyforprovider : ''); + } require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';