decode html entities in plain text email (#19518)

tillkruss · taylorotwell · commit fd40d0c8b670 · 2017-06-08T07:57:01.000-05:00
diff --git a/src/Illuminate/Mail/Markdown.php b/src/Illuminate/Mail/Markdown.php
@@ -77,9 +77,13 @@ public function renderText($view, array $data = [])
     {
         $this->view->flushFinderCache();
 
-        return new HtmlString(preg_replace("/[\r\n]{2,}/", "\n\n", $this->view->replaceNamespace(
+        $contents = $this->view->replaceNamespace(
             'mail', $this->markdownComponentPaths()
-        )->make($view, $data)->render()));
+        )->make($view, $data)->render();
+
+        return new HtmlString(
+            html_entity_decode(preg_replace("/[\r\n]{2,}/", "\n\n", $contents), ENT_QUOTES, 'UTF-8')
+        );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,13 @@ public function renderText($view, array $data = [])`
`77`	`77`	`{`
`78`	`78`	`$this->view->flushFinderCache();`
`79`	`79`
`80`		`- return new HtmlString(preg_replace("/[\r\n]{2,}/", "\n\n", $this->view->replaceNamespace(`
	`80`	`+ $contents = $this->view->replaceNamespace(`
`81`	`81`	`'mail', $this->markdownComponentPaths()`
`82`		`- )->make($view, $data)->render()));`
	`82`	`+ )->make($view, $data)->render();`
	`83`	`+`
	`84`	`+ return new HtmlString(`
	`85`	`+ html_entity_decode(preg_replace("/[\r\n]{2,}/", "\n\n", $contents), ENT_QUOTES, 'UTF-8')`
	`86`	`+ );`
`83`	`87`	`}`
`84`	`88`
`85`	`89`	`/**`