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 <eldy@destailleur.fr>
This commit is contained in:
MDW 2024-02-21 17:31:08 +01:00 committed by GitHub
parent 05f809818e
commit 05527d3998
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -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);
}