tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fixed injector usage in i18nTextCollector

Browse Source 
Using singleton, which causes master strings to be cached
between modules with merge=true. Regression from a3c406e4d2.
This commit is contained in:
Ingo Schommer 2013-06-02 23:30:33 +02:00
parent a3c406e4d2
commit 857af16b5b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i18n/i18nTextCollector.php
View File

@ -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;