Merge remote-tracking branch 'origin/MAGETWO-49827' into develop

Yaroslav Onischenko · Yaroslav Onischenko · commit 9e6769925c63 · 2016-03-14T17:43:29.000+02:00
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/addto.phtml b/app/code/Magento/Wishlist/view/frontend/templates/addto.phtml
@@ -7,8 +7,8 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php
-                echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions());
+            "addToWishlist": <?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')
+                ->jsonEncode($block->getWishlistOptions());
             ?>
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`<script type="text/x-magento-init">`
`8`	`8`	`{`
`9`	`9`	`"body": {`
`10`		`- "addToWishlist": <?php`
`11`		`- echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions());`
	`10`	`+ "addToWishlist": <?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')`
	`11`	`+ ->jsonEncode($block->getWishlistOptions());`
`12`	`12`	`?>`
`13`	`13`	`}`
`14`	`14`	`}`