diff --git a/build/exe/doliwamp/php.ini.install b/build/exe/doliwamp/php.ini.install
index 928e967f184..04191a71f5a 100644
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -653,6 +653,8 @@ default_socket_timeout = 60
; extension folders as well as the separate PECL DLL download (PHP 5).
; Be sure to appropriately set the extension_dir directive.
+; If an extension does not load, run "deplister.exe php_xxx.dll" to get list of dependency dll missing.
+
extension=php_bz2.dll
extension=php_curl.dll
;extension=php_dba.dll
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7341bc0c2cb..c930dbf172a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7037,7 +7037,7 @@ function getLanguageCodeFromCountryCode($countrycode)
$buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);
if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode);
- if (function_exists('locale_get_primary_language')) // Need extension php-intl
+ if (function_exists('locale_get_primary_language') && function_exists('locale_get_region')) // Need extension php-intl
{
foreach ($locales as $locale)
{
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 55331634aff..0b98183904a 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -127,7 +127,7 @@ if (! function_exists("imagecreate"))
{
$langs->load("errors");
print '
'.$langs->trans("ErrorPHPDoesNotSupportGD")."
\n";
- // $checksok=0; // If image ko, just warning. So check must still be 1 (otherwise no way to install)
+ // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
}
else
{
@@ -140,7 +140,7 @@ if (! function_exists("curl_init"))
{
$langs->load("errors");
print '
'.$langs->trans("ErrorPHPDoesNotSupportCurl")."
\n";
- // $checksok=0; // If image ko, just warning. So check must still be 1 (otherwise no way to install)
+ // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
}
else
{
@@ -153,7 +153,7 @@ if (! function_exists("utf8_encode"))
{
$langs->load("errors");
print '
'.$langs->trans("ErrorPHPDoesNotSupportUTF8")."
\n";
- // $checksok=0; // If image ko, just warning. So check must still be 1 (otherwise no way to install)
+ // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
}
else
{
@@ -162,11 +162,11 @@ else
// Check if UTF8 supported
-if (! function_exists("locale_get_primary_language"))
+if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region"))
{
$langs->load("errors");
print '
'.$langs->trans("ErrorPHPDoesNotSupportIntl")."
\n";
- // $checksok=0; // If image ko, just warning. So check must still be 1 (otherwise no way to install)
+ // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
}
else
{