Merge remote-tracking branch 'gl/AC-1379_v1' into GL_Mainline_PR_06012022

glo71317 · glo71317 · commit beee1a00ee8d · 2022-01-07T13:16:04.000+05:30
diff --git a/app/code/Magento/Variable/Model/Variable.php b/app/code/Magento/Variable/Model/Variable.php
@@ -129,7 +129,7 @@ public function getValue($type = null)
             $value = $this->getData('plain_value');
             //escape html if type is html, but html value is not defined
             if ($type == self::TYPE_HTML) {
-                $value = nl2br($this->_escaper->escapeHtml($value));
+                $value = nl2br((string)$this->_escaper->escapeHtml($value));
             }
             return $value;
         }

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function getValue($type = null)`
`129`	`129`	`$value = $this->getData('plain_value');`
`130`	`130`	`//escape html if type is html, but html value is not defined`
`131`	`131`	`if ($type == self::TYPE_HTML) {`
`132`		`- $value = nl2br($this->_escaper->escapeHtml($value));`
	`132`	`+ $value = nl2br((string)$this->_escaper->escapeHtml($value));`
`133`	`133`	`}`
`134`	`134`	`return $value;`
`135`	`135`	`}`