From 05527d3998a5b8ecabe0110b3d3e13ec580bacce Mon Sep 17 00:00:00 2001 From: MDW Date: Wed, 21 Feb 2024 17:31:08 +0100 Subject: [PATCH] Fix: Allow new & old names to check if module is loaded. (#28297) * Fix: Allow new & old names to check if module is loaded. # Fix: Allow new & old names to check if module is loaded. The method 'isModEnabled()' was already checking some modules for their new name, but after transitioning Conf this was not working for 'member'. Now testing for both names as 'Conf' can handle both and deprecation will be reported. Several issues were discovered after removing deprecated values. * Update functions.lib.php --------- Co-authored-by: Laurent Destailleur --- htdocs/core/lib/functions.lib.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f02017700e3..ff40c78e06b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -216,23 +216,31 @@ function isModEnabled($module) { global $conf; - // Fix special cases + // Fix old names (map to new names) $arrayconv = array( - 'bank' => 'banque', - 'category' => 'categorie', - 'contract' => 'contrat', - 'project' => 'projet', - 'delivery_note' => 'expedition' + 'adherent' => 'member', + 'banque' => 'bank', + 'categorie' => 'category', + 'commande' => 'order', + 'contrat' => 'contract', + 'expedition' => 'delivery_note', + 'facture' => 'invoice', + 'projet' => 'project', + 'propale' => 'propal', ); + if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) { + // Special cases: both use the same module. $arrayconv['supplier_order'] = 'fournisseur'; $arrayconv['supplier_invoice'] = 'fournisseur'; } + + $module_alt = $module; if (!empty($arrayconv[$module])) { - $module = $arrayconv[$module]; + $module_alt = $arrayconv[$module]; } - return !empty($conf->modules[$module]); + return !empty($conf->modules[$module]) || !empty($conf->modules[$module_alt]); //return !empty($conf->$module->enabled); }