From 64d44fbb9332f7973a21ca9c428d64b3c29ba23d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 21 Sep 2011 20:13:06 +0200 Subject: [PATCH] [Translator] fixed recursion when using a fallback that is the same as the locale --- src/Symfony/Component/Translation/Translator.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index a6df9a01bf..e26ee47f5f 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -180,7 +180,9 @@ class Translator implements TranslatorInterface $this->loadCatalogue($fallback); } - $this->catalogues[$locale]->addFallbackCatalogue($this->catalogues[$fallback]); + if ($fallback != $locale) { + $this->catalogues[$locale]->addFallbackCatalogue($this->catalogues[$fallback]); + } } private function computeFallbackLocale($locale)