diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php index e8b7f1981985..cff0c2da2bd7 100644 --- a/src/Symfony/Component/Locale/Locale.php +++ b/src/Symfony/Component/Locale/Locale.php @@ -51,8 +51,9 @@ static public function getDisplayCountries($locale) $collator = new \Collator($locale); $countries = array(); + $bundleCountries = $bundle->get('Countries') ?: array(); - foreach ($bundle->get('Countries') as $code => $name) { + foreach ($bundleCountries as $code => $name) { // Global countries (f.i. "America") have numeric codes // Countries have alphabetic codes // "ZZ" is the code for unknown country @@ -105,8 +106,9 @@ static public function getDisplayLanguages($locale) $collator = new \Collator($locale); $languages = array(); + $bundleLanguages = $bundle->get('Languages') ?: array(); - foreach ($bundle->get('Languages') as $code => $name) { + foreach ($bundleLanguages as $code => $name) { // "mul" is the code for multiple languages if ('mul' !== $code) { $languages[$code] = $name; @@ -155,8 +157,9 @@ static public function getDisplayLocales($locale) $collator = new \Collator($locale); $locales = array(); + $bundleLocales = $bundle->get('Locales') ?: array(); - foreach ($bundle->get('Locales') as $code => $name) { + foreach ($bundleLocales as $code => $name) { $locales[$code] = $name; }