Skip to content

Commit 660c62a

Browse files
⏫ Forwardport of #12304 to 2.3-develop branch
Applied pull request patch https://github.com/magento/magento2/pull/12304.patch (created by @FreekVandeursen) based on commit(s): 1. 470c257 2. 3d1d027 3. 723452c
1 parent 8e77e2f commit 660c62a

File tree

2 files changed

+5
-2
lines changed
  • dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb
  • lib/internal/Magento/Framework/App/Language

2 files changed

+5
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
four and 75/100,4.75
2-
four and 5/10,4.50
2+
four and 5/10,4.50
3+

lib/internal/Magento/Framework/App/Language/Dictionary.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,9 @@ private function readPackCsv($vendor, $package)
193193
foreach ($foundCsvFiles as $foundCsvFile) {
194194
$file = $directoryRead->openFile($foundCsvFile);
195195
while (($row = $file->readCsv()) !== false) {
196-
$result[$row[0]] = $row[1];
196+
if (is_array($row) && count($row) > 1) {
197+
$result[$row[0]] = $row[1];
198+
}
197199
}
198200
}
199201
}

0 commit comments

Comments
 (0)