lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Avoid error 500 when extension php-intl not loaded

Browse Source
This commit is contained in:
Laurent Destailleur 2019-04-03 18:38:27 +02:00
parent 83cf0dabae
commit 82c19a6372
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/functions.lib.php
View File

@ -7026,6 +7026,8 @@ function getLanguageCodeFromCountryCode($countrycode)
$buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode); $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);
if (in_array($buildprimarykeytotest, $locales)) return 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
{
foreach ($locales as $locale) foreach ($locales as $locale)
{ {
$locale_language = locale_get_primary_language($locale); $locale_language = locale_get_primary_language($locale);
@ -7036,6 +7038,7 @@ function getLanguageCodeFromCountryCode($countrycode)
return strtolower($locale_language).'_'.strtoupper($locale_region); return strtolower($locale_language).'_'.strtoupper($locale_region);
} }
} }
}
return null; return null;
} }