Merge remote-tracking branch 'vanilla/MAGETWO-38790' into PR

guz-anton · guz-anton · commit acb56a58d3d9 · 2015-07-06T22:59:12.000+03:00
diff --git a/app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml b/app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml
@@ -28,7 +28,7 @@
                 "cookieNotices": {
                     "cookieAllowButtonSelector": "#btn-cookie-allow",
                     "cookieName": "<?php echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
-                    "cookieValue": "<?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>",
+                    "cookieValue": <?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>,
                     "cookieLifetime": <?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getCookieRestrictionLifetime()?>,
                     "noCookiesUrl": "<?php echo $block->getUrl('cookie/index/noCookies') ?>"
                 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`"cookieNotices": {`
`29`	`29`	`"cookieAllowButtonSelector": "#btn-cookie-allow",`
`30`	`30`	`"cookieName": "<?php echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",`
`31`		`- "cookieValue": "<?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>",`
	`31`	`+ "cookieValue": <?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>,`
`32`	`32`	`"cookieLifetime": <?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getCookieRestrictionLifetime()?>,`
`33`	`33`	`"noCookiesUrl": "<?php echo $block->getUrl('cookie/index/noCookies') ?>"`
`34`	`34`	`}`