Skip to content

Commit

Permalink
Revert "Merge pull request #3188 from christianharrington/bugfix/cach…
Browse files Browse the repository at this point in the history
…ed-collection-race-condition"

This reverts commit b8dbee8, reversing
changes made to 2b29f53.
  • Loading branch information
markusguenther committed Jan 15, 2025
1 parent b8dbee8 commit 260e886
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions Neos.Flow/Classes/I18n/Service.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ public function initializeObject()
$this->configuration = new Configuration($this->settings['defaultLocale']);
$this->configuration->setFallbackRule($this->settings['fallbackRule']);

$cachedCollection = $this->cache->get('availableLocales');

if ($cachedCollection !== false) {
$this->localeCollection = $cachedCollection;
if ($this->cache->has('availableLocales')) {
$this->localeCollection = $this->cache->get('availableLocales');
} elseif (isset($this->settings['availableLocales']) && !empty($this->settings['availableLocales'])) {
$this->generateAvailableLocalesCollectionFromSettings();
$this->cache->set('availableLocales', $this->localeCollection);
Expand Down

0 comments on commit 260e886

Please sign in to comment.