Skip to content
Snippets Groups Projects
Unverified Commit b05a9575 authored by Ievgen Shakhsuvarov's avatar Ievgen Shakhsuvarov Committed by GitHub
Browse files

Merge pull request #1734 from magento-engcom/2.2-develop-prs 

[EngCom] Public Pull Requests - 2.2-develop
 - MAGETWO-84098: Webshop throws an exception when sharing wishlist with RSS enabled #12276
 - MAGETWO-84081: 9684: No ACL set for integrations #12332
 - MAGETWO-84006: Fix robots.txt content type to 'text/plain' #12310
 - MAGETWO-83977: Handle empty or incorrect lines in a language CSV #12304
parents f2f94cf3 56e8d72a
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 5 deletions
app/code/Magento/Integration/etc/acl.xml 0 → 100644
+ 20
− 0
View file @ b05a9575
<?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>
app/code/Magento/Robots/Controller/Index/Index.php
+ 1
− 0
View file @ b05a9575
...@@ -43,6 +43,7 @@ class Index extends Action ...@@ -43,6 +43,7 @@ class Index extends Action
/** @var Page $resultPage */ /** @var Page $resultPage */
$resultPage = $this->resultPageFactory->create(true); $resultPage = $this->resultPageFactory->create(true);
$resultPage->addHandle('robots_index_index'); $resultPage->addHandle('robots_index_index');
$resultPage->setHeader('Content-Type', 'text/plain');
return $resultPage; return $resultPage;
} }
} }
app/code/Magento/Robots/Test/Unit/Controller/Index/IndexTest.php
+ 3
− 0
View file @ b05a9575
...@@ -51,6 +51,9 @@ class IndexTest extends \PHPUnit\Framework\TestCase ...@@ -51,6 +51,9 @@ class IndexTest extends \PHPUnit\Framework\TestCase
$resultPageMock->expects($this->once()) $resultPageMock->expects($this->once())
->method('addHandle') ->method('addHandle')
->with('robots_index_index'); ->with('robots_index_index');
$resultPageMock->expects($this->once())
->method('setHeader')
->with('Content-Type', 'text/plain');
$this->resultPageFactory->expects($this->any()) $this->resultPageFactory->expects($this->any())
->method('create') ->method('create')
......
app/code/Magento/Wishlist/view/frontend/layout/wishlist_email_rss.xml
+ 1
− 3
View file @ b05a9575
...@@ -7,8 +7,6 @@ ...@@ -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"> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body> <body>
<referenceContainer name="root"> <block class="Magento\Wishlist\Block\Rss\EmailLink" name="wishlist.email.rss" cacheable="false"/>
<block class="Magento\Wishlist\Block\Rss\EmailLink" name="wishlist.email.rss" cacheable="false"/>
</referenceContainer>
</body> </body>
</page> </page>
dev/tests/integration/testsuite/Magento/Framework/App/Language/_files/bar/en_gb/1.csv
+ 2
− 1
View file @ b05a9575
four and 75/100,4.75 four and 75/100,4.75
four and 5/10,4.50 four and 5/10,4.50
\ No newline at end of file
lib/internal/Magento/Framework/App/Language/Dictionary.php
+ 3
− 1
View file @ b05a9575
...@@ -193,7 +193,9 @@ class Dictionary ...@@ -193,7 +193,9 @@ class Dictionary
foreach ($foundCsvFiles as $foundCsvFile) { foreach ($foundCsvFiles as $foundCsvFile) {
$file = $directoryRead->openFile($foundCsvFile); $file = $directoryRead->openFile($foundCsvFile);
while (($row = $file->readCsv()) !== false) { while (($row = $file->readCsv()) !== false) {
$result[$row[0]] = $row[1]; if (is_array($row) && count($row) > 1) {
$result[$row[0]] = $row[1];
}
} }
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment