Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0

This commit is contained in:
Laurent Destailleur 2022-12-26 15:20:28 +01:00
commit 76b7f80443

View File

@ -64,14 +64,16 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
if (preg_match('/^mod_barcode_product_.*php$/', $file)) { if (preg_match('/^mod_barcode_product_.*php$/', $file)) {
$file = substr($file, 0, dol_strlen($file) - 4); $file = substr($file, 0, dol_strlen($file) - 4);
try { if ($file == $conf->global->BARCODE_PRODUCT_ADDON_NUM) {
dol_include_once($dirroot.$file.'.php'); try {
} catch (Exception $e) { dol_include_once($dirroot.$file.'.php');
dol_syslog($e->getMessage(), LOG_ERR); } catch (Exception $e) {
} dol_syslog($e->getMessage(), LOG_ERR);
}
$modBarCodeProduct = new $file(); $modBarCodeProduct = new $file();
break; break;
}
} }
} }
closedir($handle); closedir($handle);