Skip to content

Commit 77a195f

Browse files
otoolecotoolec
committed
Merge remote-tracking branch 'upstreamce/develop' into MAGETWO-33373
2 parents 6da4115 + 209cfbe commit 77a195f

File tree

64 files changed

+394
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+394
-209
lines changed

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -554,33 +554,6 @@
554554
<label>Default No-route URL</label>
555555
</field>
556556
</group>
557-
<group id="cookie" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
558-
<label>Default Cookie Settings</label>
559-
<field id="cookie_lifetime" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
560-
<label>Cookie Lifetime</label>
561-
<backend_model>Magento\Backend\Model\Config\Backend\Cookie\Lifetime</backend_model>
562-
</field>
563-
<field id="cookie_path" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
564-
<label>Cookie Path</label>
565-
<backend_model>Magento\Backend\Model\Config\Backend\Cookie\Path</backend_model>
566-
</field>
567-
<field id="cookie_domain" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
568-
<label>Cookie Domain</label>
569-
<backend_model>Magento\Backend\Model\Config\Backend\Cookie\Domain</backend_model>
570-
</field>
571-
<field id="cookie_httponly" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
572-
<label>Use HTTP Only</label>
573-
<comment>
574-
<![CDATA[<strong style="color:red">Warning</strong>: Do not set to "No". User security could be compromised.]]>
575-
</comment>
576-
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
577-
</field>
578-
<field id="cookie_restriction" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
579-
<label>Cookie Restriction Mode</label>
580-
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
581-
<backend_model>Magento\Backend\Model\Config\Backend\Cookie</backend_model>
582-
</field>
583-
</group>
584557
<group id="session" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
585558
<label>Session Validation Settings</label>
586559
<field id="use_remote_addr" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">

‎app/code/Magento/Catalog/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
"magento/framework": "0.42.0-beta6",
2929
"magento/magento-composer-installer": "*"
3030
},
31+
"suggest": {
32+
"magento/module-cookie": "0.42.0-beta6"
33+
},
3134
"type": "magento2-module",
3235
"version": "0.42.0-beta6",
3336
"license": [

‎app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</action>
7474
</block>
7575
</block>
76-
<block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml">
76+
<block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">
7777
<arguments>
7878
<argument name="triggers" xsi:type="array">
7979
<item name="compareProductLink" xsi:type="string">.action.tocompare</item>

‎app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</arguments>
120120
</block>
121121
</block>
122-
<block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml">
122+
<block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">
123123
<arguments>
124124
<argument name="triggers" xsi:type="array">
125125
<item name="compareProductLink" xsi:type="string">.action.tocompare</item>

‎app/code/Magento/Checkout/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
"magento/module-quote": "0.42.0-beta6",
2424
"magento/magento-composer-installer": "*"
2525
},
26+
"suggest": {
27+
"magento/module-cookie": "0.42.0-beta6"
28+
},
2629
"type": "magento2-module",
2730
"version": "0.42.0-beta6",
2831
"license": [

‎app/code/Magento/Checkout/view/frontend/layout/catalog_category_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="content">
11-
<block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml">
11+
<block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">
1212
<arguments>
1313
<argument name="triggers" xsi:type="array">
1414
<item name="addToCartLink" xsi:type="string">.action.tocart</item>

‎app/code/Magento/Checkout/view/frontend/layout/catalog_product_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="content">
11-
<block class="Magento\Core\Block\RequireCookie" name="require-cookie" template="Magento_Core::require_cookie.phtml">
11+
<block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">
1212
<arguments>
1313
<argument name="triggers" xsi:type="array">
1414
<item name="addToCartLink" xsi:type="string">.action.tocart</item>

‎app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/code/Magento/Cms/Controller/Index/NoCookies.php

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎app/code/Magento/Cms/Model/Observer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function noCookies(\Magento\Framework\Event\Observer $observer)
7575
if ($pageUrl) {
7676
$redirect->setRedirectUrl($pageUrl);
7777
} else {
78-
$redirect->setRedirect(true)->setPath('cms/index/noCookies')->setArguments([]);
78+
$redirect->setRedirect(true)->setPath('cookie/index/noCookies')->setArguments([]);
7979
}
8080
return $this;
8181
}

0 commit comments

Comments
 (0)