Back ported ed9612d by @clue

WyriHaximus · WyriHaximus · commit a6be50852a40 · 2015-11-16T21:22:33.000+01:00
diff --git a/src/Mime/Html.php b/src/Mime/Html.php
@@ -44,7 +44,7 @@ public function extract(array $replacements, UrlInterface $url)
         if (preg_match('#<title[^>]*>(.*?)</title>#is', $url->getBody(), $match)) {
             $replacements['%composed-title%'] =
             $replacements['%title%'] =
-            preg_replace('/[\s\v]+/', ' ', trim(html_entity_decode($match[1])));
+            preg_replace('/[\s\v]+/', ' ', trim(html_entity_decode($match[1], ENT_QUOTES | ENT_HTML5)));
         }
 
         return $replacements;
diff --git a/tests/Mime/HtmlTest.php b/tests/Mime/HtmlTest.php
@@ -53,6 +53,13 @@ public function testExtractProvider() {
                 ),
                 new Url('', '<html><title>foo</title></html></html>', array(), 200, 1),
             ),
+            array(
+                array(
+                    '%title%' => 'foo\'s wörk',
+                    '%composed-title%' => 'foo\'s wörk',
+                ),
+                new Url('', '<html><title>foo&#39;s w&ouml;rk</title></html></html>', array(), 200, 1),
+            ),
             array(
                 array(),
                 new Url('', '', array(), 200, 1),
@@ -68,4 +75,4 @@ public function testExtract($expected, $url) {
         $this->assertSame($expected, $mime->extract(array(), $url));
     }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function extract(array $replacements, UrlInterface $url)`
`44`	`44`	`if (preg_match('#<title[^>]>(.?)</title>#is', $url->getBody(), $match)) {`
`45`	`45`	`$replacements['%composed-title%'] =`
`46`	`46`	`$replacements['%title%'] =`
`47`		`- preg_replace('/[\s\v]+/', ' ', trim(html_entity_decode($match[1])));`
	`47`	`+ preg_replace('/[\s\v]+/', ' ', trim(html_entity_decode($match[1], ENT_QUOTES \| ENT_HTML5)));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`return $replacements;`