Merge remote-tracking branch 'origin/MAGETWO-49512' into BUGS

Author: slavvka

app/code/Magento/Translation/Model/Inline/Parser.php

@@ -603,12 +603,13 @@ private function _otherText()
         while (preg_match('#' . self::REGEXP_TOKEN . '#', $this->_content, $matches, PREG_OFFSET_CAPTURE, $next)) {
             $translateProperties = json_encode(
                 [
-                    'shown' => htmlspecialchars($matches[1][0]),
-                    'translated' => htmlspecialchars($matches[2][0]),
+                    'shown' => $matches[1][0],
+                    'translated' => $matches[2][0],
                     'original' => $matches[3][0],
                     'location' => 'Text',
-                    'scope' => htmlspecialchars($matches[4][0]),
-                ]
+                    'scope' => $matches[4][0],
+                ],
+                JSON_HEX_QUOT
             );
 
             $spanHtml = $this->_getDataTranslateSpan(

app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml

@@ -7,14 +7,4 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 
-<?php
-echo $block
-    ->escapeHtml(
-        $block->getData('product_name')
-    )
-?> has been added to your Wish List. Click <a href="<?php
-echo $block
-    ->escapeUrl(
-        $block->getData('referer')
-    )
-?>">here</a> to continue shopping.
+<?php /* @escapeVerified */ echo __('%1 has been added to your Wish List.', $block->escapeHtml($block->getData('product_name'))) ?> <?php /* @escapeNotVerified */ echo __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getData('referer')));

lib/internal/Magento/Framework/Json/Encoder.php

@@ -30,8 +30,7 @@ public function __construct(\Magento\Framework\Translate\InlineInterface $transl
      */
     public function encode($data)
     {
-        $json = \Zend_Json::encode($data);
-        $this->translateInline->processResponseBody($json, true);
-        return $json;
+        $this->translateInline->processResponseBody($data);
+        return \Zend_Json::encode($data);
     }
 }