From 857af16b5bfa079df18f7c69638a9902615c2b97 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 2 Jun 2013 23:30:33 +0200 Subject: [PATCH] Fixed injector usage in i18nTextCollector Using singleton, which causes master strings to be cached between modules with merge=true. Regression from a3c406e4d2e2. --- i18n/i18nTextCollector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/i18nTextCollector.php b/i18n/i18nTextCollector.php index 4129ba5c1..c1e6ccf7b 100644 --- a/i18n/i18nTextCollector.php +++ b/i18n/i18nTextCollector.php @@ -155,7 +155,7 @@ class i18nTextCollector extends Object { // Currently not possible because adapter instances can't be fully reset through the Zend API, // meaning master strings accumulate across modules if($mergeWithExisting) { - $adapter = Injector::inst()->get('i18nRailsYamlAdapter'); + $adapter = Injector::inst()->create('i18nRailsYamlAdapter'); $masterFile = "{$this->basePath}/{$module}/lang/" . $adapter->getFilenameForLocale($this->defaultLocale); if(!file_exists($masterFile)) continue;