Merge remote-tracking branch 'origin/develop' into MAGETWO-54323-update

Author: Dmytro Vilchynskyi

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -395,7 +395,8 @@ protected function _getWebsiteCode($websiteId)
     {
         $storeName = ($websiteId == 0)
             ? ImportAdvancedPricing::VALUE_ALL_WEBSITES
-            : $this->_storeManager->getWebsite($websiteId)->getName();
+            : $this->_storeManager->getWebsite($websiteId)->getCode();
+        $currencyCode = '';
         if ($websiteId == 0) {
             $currencyCode = $this->_storeManager->getWebsite($websiteId)->getBaseCurrencyCode();
         }

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

@@ -131,7 +131,10 @@ protected function placeCheckoutOrder()
             $result->setData('error_messages', $exception->getMessage());
         } catch (\Exception $exception) {
             $result->setData('error', true);
-            $result->setData('error_messages', __('Unable to place order. Please try again later.'));
+            $result->setData(
+                'error_messages',
+                __('An error occurred on the server. Please try to place the order again.')
+            );
         }
         if ($response instanceof Http) {
             $response->representJson($this->jsonHelper->jsonEncode($result));

app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php

@@ -280,7 +280,10 @@ public function textExecuteFailedPlaceOrderDataProvider()
     {
         $objectFailed = new \Magento\Framework\DataObject();
         $objectFailed->setData('error', true);
-        $objectFailed->setData('error_messages', __('Unable to place order. Please try again later.'));
+        $objectFailed->setData(
+            'error_messages',
+            __('An error occurred on the server. Please try to place the order again.')
+        );
 
         return [
             [

app/code/Magento/Authorizenet/i18n/en_US.csv

@@ -2,7 +2,7 @@
 "Order saving error: %1","Order saving error: %1"
 "Please choose a payment method.","Please choose a payment method."
 "We can\'t process your order right now. Please try again later.","We can\'t process your order right now. Please try again later."
-"Unable to place order. Please try again later.","Unable to place order. Please try again later."
+"An error occurred on the server. Please try to place the order again.","An error occurred on the server. Please try to place the order again."
 "Credit Card: xxxx-%1","Credit Card: xxxx-%1"
 "amount %1","amount %1"
 failed.,failed.

app/code/Magento/Backend/Block/Widget/Button.php

@@ -113,7 +113,7 @@ protected function _attributesToHtml($attributes)
             if ($attributeValue === null || $attributeValue == '') {
                 continue;
             }
-            $html .= $attributeKey . '="' . $this->escapeHtml($attributeValue) . '" ';
+            $html .= $attributeKey . '="' . $this->escapeHtmlAttr($attributeValue, false) . '" ';
         }
 
         return $html;

app/code/Magento/Backend/Block/Widget/Button/SplitButton.php

@@ -229,7 +229,7 @@ protected function _getAttributesString($attributes)
             if ($attributeValue === null || $attributeValue == '') {
                 continue;
             }
-            $html[] = $attributeKey . '="' . $this->escapeHtml($attributeValue) . '"';
+            $html[] = $attributeKey . '="' . $this->escapeHtmlAttr($attributeValue, false) . '"';
         }
         return join(' ', $html);
     }

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php

@@ -82,7 +82,9 @@ protected function _toOptionHtml($action, \Magento\Framework\DataObject $row)
         $actionCaption = '';
         $this->_transformActionData($action, $actionCaption, $row);
 
-        $htmlAttributes = ['value' => $this->escapeHtml($this->_jsonEncoder->encode($action))];
+        $htmlAttributes = [
+            'value' => $this->escapeHtmlAttr($this->_jsonEncoder->encode($action), false)
+        ];
         $actionAttributes->setData($htmlAttributes);
         return '<option ' . $actionAttributes->serialize() . '>' . $actionCaption . '</option>';
     }

app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

@@ -54,7 +54,7 @@ protected function _construct()
     {
         parent::_construct();
 
-        $this->setErrorText($this->escapeJsQuote(__('Please select items.')));
+        $this->setErrorText($this->escapeHtml(__('Please select items.')));
 
         if (null !== $this->getOptions()) {
             foreach ($this->getOptions() as $optionId => $option) {

app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

@@ -66,7 +66,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setErrorText($this->escapeJsQuote(__('Please select items.')));
+        $this->setErrorText($this->escapeHtml(__('Please select items.')));
     }
 
     /**

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -17,7 +17,7 @@
                     class="search-global-input"
                     id="search-global"
                     name="query"
-                    data-mage-init='<?php echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWidgetInitOptions()))?>'>
+                    data-mage-init='<?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWidgetInitOptions()) ?>'>
             <button
                 type="submit"
                 class="search-global-action"