From ef9c6aa04ca79453034b9d97976ea6d2d7a685af Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 24 Mar 2024 15:34:19 +0100 Subject: [PATCH] Try to FIX #28482 --- htdocs/filefunc.inc.php | 2 +- htdocs/install/inc.php | 2 +- htdocs/support/inc.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 0eee6208397..9c2e25f6d19 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -221,7 +221,7 @@ $dolibarr_main_url_root_alt = (empty($dolibarr_main_url_root_alt) ? '' : trim($d $dolibarr_main_document_root = (empty($dolibarr_main_document_root) ? '' : trim($dolibarr_main_document_root)); $dolibarr_main_document_root_alt = (empty($dolibarr_main_document_root_alt) ? '' : trim($dolibarr_main_document_root_alt)); -if (empty($dolibarr_main_db_port)) { +if (!isset($dolibarr_main_db_port)) { $dolibarr_main_db_port = 3306; // For compatibility with old configs, if not defined, we take 'mysql' type } if (empty($dolibarr_main_db_type)) { diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 871030cb774..dd947a11d66 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -209,7 +209,7 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > $dolibarr_main_db_type = 'mysqli'; } - if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) { + if (!isset($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) { $dolibarr_main_db_port = '3306'; // For backward compatibility } diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 750db8b0484..85a2595d1cd 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -75,7 +75,7 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > $dolibarr_main_db_type = 'mysqli'; } - if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) { + if (!isset($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) { $dolibarr_main_db_port = '3306'; // For backward compatibility }