diff options
Diffstat (limited to 'Zotlabs/Module/Linkinfo.php')
| -rw-r--r-- | Zotlabs/Module/Linkinfo.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index 038c739d5..081966dba 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -291,11 +291,15 @@ class Linkinfo extends \Zotlabs\Web\Controller { // Check codepage in HTTP headers or HTML if not exist $cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : ''); - if(empty($cp)) - $cp = (preg_match('/meta.+content=["\']text\/html; charset=([^"\']+)/i', $body, $o) ? $o[1] : 'AUTO'); + if(empty($cp)) { + $cp = (preg_match('/meta.+content=["\']text\/html; charset=([^"\']+)/i', $body, $o) ? $o[1] : 'AUTO'); + } + + $body = mb_convert_encoding($body, 'UTF-8', $cp); - $body = mb_convert_encoding($body, 'UTF-8', $cp); - $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); + // Handling HTML entities via mbstring is deprecated + //$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); + $body = mb_encode_numericentity($body, [0x80, 0x10FFFF, 0, ~0], 'UTF-8'); $doc = new \DOMDocument(); @$doc->loadHTML($body); |