From 82c19a6372da4b4b869d8706cf64a3b9377de55d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Apr 2019 18:38:27 +0200 Subject: [PATCH] FIX Avoid error 500 when extension php-intl not loaded --- htdocs/core/lib/functions.lib.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 57d5329717c..53004614f68 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -7026,15 +7026,18 @@ function getLanguageCodeFromCountryCode($countrycode) $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode); if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode); - foreach ($locales as $locale) + if (function_exists('locale_get_primary_language')) // Need extension php-intl { - $locale_language = locale_get_primary_language($locale); - $locale_region = locale_get_region($locale); - if (strtoupper($countrycode) == $locale_region) - { - //var_dump($locale.'-'.$locale_language.'-'.$locale_region); - return strtolower($locale_language).'_'.strtoupper($locale_region); - } + foreach ($locales as $locale) + { + $locale_language = locale_get_primary_language($locale); + $locale_region = locale_get_region($locale); + if (strtoupper($countrycode) == $locale_region) + { + //var_dump($locale.'-'.$locale_language.'-'.$locale_region); + return strtolower($locale_language).'_'.strtoupper($locale_region); + } + } } return null;