ACP2E-1602: [Issue] Fixed the welcome message contains single quote character

glo23503 · glo23503 · commit ca13647db550 · 2023-02-06T20:05:42.000+05:30
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
@@ -57,8 +57,6 @@ public function getWelcome()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        $this->_data['welcome'] =  $this->escaper->escapeQuote($this->_data['welcome'], true);
-        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        return addslashes(__($this->_data['welcome']));
+        $this->escaper->escapeQuote(__($this->_data['welcome'])->render(), true);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ public function getWelcome()`
`57`	`57`	`\Magento\Store\Model\ScopeInterface::SCOPE_STORE`
`58`	`58`	`);`
`59`	`59`	`}`
`60`		`- $this->_data['welcome'] = $this->escaper->escapeQuote($this->_data['welcome'], true);`
`61`		`- // phpcs:ignore Magento2.Functions.DiscouragedFunction`
`62`		`- return addslashes(__($this->_data['welcome']));`
	`60`	`+ $this->escaper->escapeQuote(__($this->_data['welcome'])->render(), true);`
`63`	`61`	`}`
`64`	`62`	`}`