Merge pull request neos#1899 from cron-eu/4.3-issue-564-datesreader-c…

…ache BUGFIX: Make sure to use only a consistent DatesReaderCache
kdambekalns · Jan 24, 2020 · bf069e8 · bf069e8
2 parents bc4b81d + 220bbe3
commit bf069e8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Neos.Flow/Classes/I18n/Cldr/Reader/DatesReader.php b/Neos.Flow/Classes/I18n/Cldr/Reader/DatesReader.php
@@ -261,8 +261,9 @@ public function parseFormatFromCldr(Locale $locale, $formatType, $formatLength)
         self::validateFormatType($formatType);
         self::validateFormatLength($formatLength);
 
-        if (isset($this->parsedFormatsIndices[(string)$locale][$formatType][$formatLength])) {
-            return $this->parsedFormats[$this->parsedFormatsIndices[(string)$locale][$formatType][$formatLength]];
+        $parsedFormatIndex = $this->parsedFormatsIndices[(string)$locale][$formatType][$formatLength] ?? '';
+        if (isset($this->parsedFormats[$parsedFormatIndex])) {
+            return $this->parsedFormats[$parsedFormatIndex];
         }
 
         $model = $this->cldrRepository->getModelForLocale($locale);