MERGE: Merge branch '5.0' into 5.1

neos · Feb 14, 2020 · 404b066 · 404b066
2 parents 25e06fa + 3635f64
commit 404b066
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Classes/I18n/Cldr/Reader/DatesReader.php b/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);