Fix for doliwamp

This commit is contained in:
Laurent Destailleur 2019-06-30 23:52:28 +02:00
parent 8f5b575b19
commit 46ced373be
2 changed files with 13 additions and 10 deletions

View File

@ -5,6 +5,7 @@
// during install process to be used. // during install process to be used.
// //
// //
$force_install_type='doliwamp';
$force_install_noedit=2; // 1=To block vars specific to distrib, 2 to block all technical parameters $force_install_noedit=2; // 1=To block vars specific to distrib, 2 to block all technical parameters
$force_install_message='KeepDefaultValuesWamp'; $force_install_message='KeepDefaultValuesWamp';
$force_install_main_data_root='WAMPROOT/dolibarr_documents'; $force_install_main_data_root='WAMPROOT/dolibarr_documents';

View File

@ -161,18 +161,20 @@ else
} }
// Check if UTF8 supported // Check if intl methods are supported
if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region")) if (empty($force_install_type) || $force_install_type != 'doliwamp')
{ {
$langs->load("errors"); if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region"))
print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n"; {
// $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install) $langs->load("errors");
print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
// $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
}
else
{
print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
}
} }
else
{
print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
}
// Check memory // Check memory