From 4147b53d52cbefa60028d693722facbf87f9c128 Mon Sep 17 00:00:00 2001
From: paresh pansuriya <paresh.pansuriya1@gmail.com>
Date: Sun, 7 Jan 2018 12:01:06 +0530
Subject: [PATCH 1/3] Default Welcome message is broken on storefront with
 enabled translate-inline #12711

---
 .../Magento/Theme/view/frontend/templates/html/header.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
index 58548a0ba268a..4395cab651de1 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
@@ -19,7 +19,7 @@ $welcomeMessage = $block->getWelcome();
             </span>
             <!-- /ko -->
             <!-- ko ifnot: customer().fullname  -->
-            <span data-bind='html:"<?= $block->escapeHtmlAttr($welcomeMessage) ?>"'></span>
+            <span data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
             <?= $block->getBlockHtml('header.additional') ?>
             <!-- /ko -->
         </li>

From 06104496d566917f5649208f0157245abea4a804 Mon Sep 17 00:00:00 2001
From: pareshpansuriya <paresh.pansuriya1@gmail.com>
Date: Fri, 2 Feb 2018 11:53:31 +0530
Subject: [PATCH 2/3] welcome-message-or-keyword

---
 .../view/frontend/templates/account/link/authorization.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
index 10223df489e90..24657a6846cae 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
@@ -13,7 +13,7 @@ if ($block->isLoggedIn()) {
     $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
 }
 ?>
-<li class="authorization-link" data-label="<?= $block->escapeHtmlAttr(__('or')) ?>">
+<li class="authorization-link" data-label="<?= $block->escapeHtml(__('or')) ?>">
     <a <?= /* @noEscape */ $block->getLinkAttributes() ?><?= /* @noEscape */ $dataPostParam ?>>
         <?= $block->escapeHtml($block->getLabel()) ?>
     </a>

From 5367c47ee473d165af95b0c732ff016f78aeeb65 Mon Sep 17 00:00:00 2001
From: Matthias Zeis <admin@matthias-zeis.com>
Date: Tue, 27 Feb 2018 20:13:13 +0100
Subject: [PATCH 3/3] Revert "welcome-message-or-keyword"

This reverts commit 7e913f177b1962d887a56af2e98dd8e2ef6748aa.
---
 .../view/frontend/templates/account/link/authorization.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
index 24657a6846cae..10223df489e90 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
@@ -13,7 +13,7 @@ if ($block->isLoggedIn()) {
     $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
 }
 ?>
-<li class="authorization-link" data-label="<?= $block->escapeHtml(__('or')) ?>">
+<li class="authorization-link" data-label="<?= $block->escapeHtmlAttr(__('or')) ?>">
     <a <?= /* @noEscape */ $block->getLinkAttributes() ?><?= /* @noEscape */ $dataPostParam ?>>
         <?= $block->escapeHtml($block->getLabel()) ?>
     </a>