⏫ Forwardport of #11058 to 2.3-develop branch

p-bystritsky · p-bystritsky · commit 076b90398852 · 2018-01-24T14:00:59.000+02:00
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
@@ -49,9 +49,7 @@ public function prepareDataSource(array $dataSource)
     {
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
-                $item[$this->getData('name')] = $this->escaper->escapeHtml(
-                    str_replace("\n", '<br/>', $item[$this->getData('name')])
-                );
+                $item[$this->getData('name')] = nl2br($this->escaper->escapeHtml($item[$this->getData('name')]));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,7 @@ public function prepareDataSource(array $dataSource)`
`49`	`49`	`{`
`50`	`50`	`if (isset($dataSource['data']['items'])) {`
`51`	`51`	`foreach ($dataSource['data']['items'] as & $item) {`
`52`		`- $item[$this->getData('name')] = $this->escaper->escapeHtml(`
`53`		`- str_replace("\n", '<br/>', $item[$this->getData('name')])`
`54`		`- );`
	`52`	`+ $item[$this->getData('name')] = nl2br($this->escaper->escapeHtml($item[$this->getData('name')]));`
`55`	`53`	`}`
`56`	`54`	`}`
`57`	`55`