diff --git a/app/code/Magento/Integration/etc/acl.xml b/app/code/Magento/Integration/etc/acl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..51eb078bd1df73a4c276dad298d3aec07b5610da
--- /dev/null
+++ b/app/code/Magento/Integration/etc/acl.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+ <acl>
+ <resources>
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::system">
+ <resource id="Magento_Integration::extensions" title="System Extensions" translate="title" sortOrder="30">
+ <resource id="Magento_Integration::integrations" title="System Integrations" translate="title" sortOrder="40" />
+ </resource>
+ </resource>
+ </resource>
+ </resources>
+ </acl>
+</config>
diff --git a/app/code/Magento/Robots/Controller/Index/Index.php b/app/code/Magento/Robots/Controller/Index/Index.php
index b94626e93432d5ebbef2af7f34db8fa3524c02b1..679066d723dce9f9c2bff40178d56f7d27d7a447 100644
--- a/app/code/Magento/Robots/Controller/Index/Index.php
+++ b/app/code/Magento/Robots/Controller/Index/Index.php
@@ -43,6 +43,7 @@ class Index extends Action
/** @var Page $resultPage */
$resultPage = $this->resultPageFactory->create(true);
$resultPage->addHandle('robots_index_index');
+ $resultPage->setHeader('Content-Type', 'text/plain');
return $resultPage;
}
}
diff --git a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
index 22a69cc13bd523e8a73686960045c23d1eecfd3e..d3a7a97c7ea805952d35f5e9bcebee90a01eaab3 100644
--- a/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
@@ -51,6 +51,9 @@ class IndexTest extends \PHPUnit\Framework\TestCase
$resultPageMock->expects($this->once())
->method('addHandle')
->with('robots_index_index');
+ $resultPageMock->expects($this->once())
+ ->method('setHeader')
+ ->with('Content-Type', 'text/plain');
$this->resultPageFactory->expects($this->any())
->method('create')
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
index 7bb186ef2ce031b8b4e71897aca982957746e781..3ba1c66e991ca93d816e92598e33b8796214b6b4 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
@@ -7,8 +7,6 @@
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
- <referenceContainer name="root">
- <block class="Magento\Wishlist\Block\Rss\EmailLink" name="wishlist.email.rss" cacheable="false"/>
- </referenceContainer>
+ <block class="Magento\Wishlist\Block\Rss\EmailLink" name="wishlist.email.rss" cacheable="false"/>
</body>
</page>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv b/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
index 0c13b51b5528733fff43daef08e61c27247d7135..235d18468b739e159fb2b5b499291d66c3e47011 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
@@ -1,2 +1,3 @@
four and 75/100,4.75
-four and 5/10,4.50
\ No newline at end of file
+four and 5/10,4.50
+
diff --git a/lib/internal/Magento/Framework/App/Language/Dictionary.php b/lib/internal/Magento/Framework/App/Language/Dictionary.php
index a8dc20d9465a3319fb41f36614bb1277ef9311e8..02ee6ca2c95791c4b1173dce23ce4533ad2da462 100644
--- a/lib/internal/Magento/Framework/App/Language/Dictionary.php
+++ b/lib/internal/Magento/Framework/App/Language/Dictionary.php
@@ -193,7 +193,9 @@ class Dictionary
foreach ($foundCsvFiles as $foundCsvFile) {
$file = $directoryRead->openFile($foundCsvFile);
while (($row = $file->readCsv()) !== false) {
- $result[$row[0]] = $row[1];
+ if (is_array($row) && count($row) > 1) {
+ $result[$row[0]] = $row[1];
+ }
}
}
}